You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/11/07 13:43:17 UTC
svn commit: r1637365 - in /manifoldcf/branches/dev_1x: ./
site/src/documentation/content/xdocs/en_US/
site/src/documentation/resources/images/en_US/
Author: kwright
Date: Fri Nov 7 12:43:16 2014
New Revision: 1637365
URL: http://svn.apache.org/r1637365
Log:
Fix for CONNECTORS-1097, from trunk.
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-queries.PNG
manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-security.PNG
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1637364
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1637365&r1=1637364&r2=1637365&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Fri Nov 7 12:43:16 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1097: Update JDBC connector documentation.
+(Karl Wright)
+
CONNECTORS-1096: Document boilerplate removal options.
(Karl Wright)
Modified: manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1637365&r1=1637364&r2=1637365&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml (original)
+++ manifoldcf/branches/dev_1x/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml Fri Nov 7 12:43:16 2014
@@ -1913,13 +1913,14 @@ curl -XGET http://localhost:9200/index/_
<br/><br/>
<figure src="images/en_US/jdbc-job-queries.PNG" alt="Generic Database Job, Queries tab" width="80%"/>
<br/><br/>
- <p>You must supply at least two queries. (A third query is optional.) The purpose of these queries is to obtain the data needed for the database to be properly crawled.
+ <p>You must supply at least two queries. (A third and fourth queries are optional.) The purpose of these queries is to obtain the data needed for the database to be properly crawled.
But in order for you to write these queries, you must make some decisions first. Basically, you need to figure out how best to map the constructs within your database
to the requirements of the Framework.</p>
<br/>
<ul>
<li>Obtain a list of document identifiers corresponding to changes and additions that occurred within a specified time window (see below)</li>
<li>Given a set of document identifiers, find the corresponding version strings (see below)</li>
+ <li>Given a set of document identifiers, find the corresponding list of access tokens for each document identifier (see below)</li>
<li>Given a set of document identifiers and version strings, find information about the document, consisting of the document's data, access URL, and metadata</li>
</ul>
<br/>
@@ -1939,6 +1940,7 @@ curl -XGET http://localhost:9200/index/_
<tr><td><b>String name</b></td><td><b>Meaning/use</b></td></tr>
<tr><td>IDCOLUMN</td><td>The name of an expected resultset column containing a document identifier</td></tr>
<tr><td>VERSIONCOLUMN</td><td>The name of an expected resultset column containing a version string</td></tr>
+ <tr><td>TOKENCOLUMN</td><td>The name of an expected resultset column containing an access token</td></tr>
<tr><td>URLCOLUMN</td><td>The name of an expected resultset column containing a URL</td></tr>
<tr><td>DATACOLUMN</td><td>The name of an expected resultset column containing document data</td></tr>
<tr><td>STARTTIME</td><td>A query string value containing a start time in milliseconds since epoch</td></tr>
@@ -2009,7 +2011,9 @@ curl -XGET http://localhost:9200/index/_
<br/>
<figure src="images/en_US/jdbc-job-security.PNG" alt="Generic Database Job, Security tab" width="80%"/>
<br/><br/>
- <p>Enter a desired access token, and click the "Add" button. You may enter multiple access tokens.</p>
+ <p>Here, you can turn off security, if you want no access tokens to be transmitted with each document. Or, you can leave security "Enabled", and either create a list of access tokens
+ by hand, using the widget on this tab, or leave these blank and provide an access token query on the "Queries" tab. To add access tokens by hand, enter a desired access token, and
+ click the "Add" button. You may enter multiple access tokens.</p>
</section>
<section id="googledriverepository">
Modified: manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-queries.PNG
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-queries.PNG?rev=1637365&r1=1637364&r2=1637365&view=diff
==============================================================================
Binary files - no diff available.
Modified: manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-security.PNG
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/site/src/documentation/resources/images/en_US/jdbc-job-security.PNG?rev=1637365&r1=1637364&r2=1637365&view=diff
==============================================================================
Binary files - no diff available.