Author: kwright
Date: Mon Jun 25 21:58:30 2012
New Revision: 1353758
URL: http://svn.apache.org/viewvc?rev=1353758&view=rev
Log:
Fix for CONNECTORS-461. Committed on behalf of Erlend Garason.
Added:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-commits.PNG
(with props)
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-documents.PNG
(with props)
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-commits_ja_JP.PNG
(with props)
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-documents_ja_JP.PNG
(with props)
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1353758&r1=1353757&r2=1353758&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 25 21:58:30 2012
@@ -7,6 +7,10 @@ CONNECTORS-484: The FileNet connector UI
the i18n work was done on it.
(Joe Becknell, Karl Wright)
+CONNECTORS-461: Mime types and document length restrictions and
+commit option for Solr output connector need documentation
+(Erlend Garåsen)
+
CONNECTORS-483: Add NTLM proxy support for Web Connector.
(Karl Wright)
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1353758&r1=1353757&r2=1353758&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
Mon Jun 25 21:58:30 2012
@@ -438,7 +438,7 @@
<p>Unfortunately, this lack of specificity comes at a cost.
Unless you take care to filter documents properly in each job, large movie
files or other opaque
content may well be picked up and sent to Solr for
indexing, which will greatly increase the dead load on the overall system. It
is therefore a good idea to review
all crawls done through a Solr connection while they
are underway, to be sure there isn't a misconfiguration of this kind.</p>
- <p>When you create a Solr output connection, three
configuration tabs appear. The "Server" tab allows you to configure the HTTP
target of the connection:</p>
+ <p>When you create a Solr output connection, five
configuration tabs appear. The "Server" tab allows you to configure the HTTP
target of the connection:</p>
<br/><br/>
<figure src="images/en_US/solr-configure-server.PNG" alt="Solr
Configuration, Server tab" width="80%"/>
<br/><br/>
@@ -450,14 +450,19 @@
<figure src="images/en_US/solr-configure-schema.PNG" alt="Solr
Configuration, Schema tab" width="80%"/>
<br/><br/>
<p>The third tab is the "Arguments" tab, which allows you to
specify arbitrary arguments to be sent to Solr. All valid Solr update request
parameters
- can be specified here. A popular example is <a
href="http://wiki.apache.org/solr/CommitWithin";>commitWithin=60000</a>, which
tells Solr to automatically commit documents behind the scenes, ensuring
- an indexing latency of maximum 60000ms (1m). Another
example is <a
href="http://wiki.apache.org/solr/UpdateRequestProcessor";>update.chain=myChain</a>
to select the document processing pipeline/chain to use for
+ can be specified here. You can for instance add <a
href="http://wiki.apache.org/solr/UpdateRequestProcessor";>update.chain=myChain</a>
to select the document processing pipeline/chain to use for
processing documents in Solr. See the Solr
documentation for more valid arguments. The tab looks like:</p>
<br/><br/>
<figure src="images/en_US/solr-configure-arguments.PNG"
alt="Solr Configuration, Arguments tab" width="80%"/>
<br/><br/>
<p>Fill in the argument name and value, and click the "Add"
button. Bear in mind that if you add an argument with the same name as an
existing one, it will replace the
existing one with the new specified value. You can
delete existing arguments by clicking the "Delete" button next to the argument
you want to delete.</p>
+ <p>The fourth tab is the "Documents" tab, which allows you to
do document filtering based on size and mime types. By specifying a maximum
document length in bytes, you can filter out documents which exceed that size
(e.g. 10485760 which is equivalent to 10 MB). If you only want to add documents
with specific mime types, you can enter them into the "included mime types"
field (e.g. "text/html" for filtering out all documents but HTML). The
"excluded mime types" field is for excluding documents with specific mime types
(e.g. "image/jpeg" for filtering out JPEG images). The tab looks like:</p>
+ <figure src="images/en_US/solr-configure-documents.PNG"
alt="Solr Configuration, Documents tab" width="80%"/>
+ <br/><br/>
+ <p>The fifth tab is the "Commits" tab, which allows you to
control the commit strategies. As well as committing documents at the end of
every job, an option which is enabled by default, you may also commit each
document within a certain time in milliseconds (e.g. "10000" for committing
within 10 seconds). The <a
href="http://wiki.apache.org/solr/CommitWithin";>commit within</a> strategy will
leave the responsibility to Solr instead of ManifoldCF. The tab looks like:</p>
+ <figure src="images/en_US/solr-configure-commits.PNG"
alt="Solr Configuration, Documents tab" width="80%"/>
+ <br/><br/>
<p>When you are done, don't forget to click the "Save" button
to save your changes! When you do, a connection summary and status screen will
be presented, which
may look something like this:</p>
<br/><br/>
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml?rev=1353758&r1=1353757&r2=1353758&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
Mon Jun 25 21:58:30 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -324,7 +324,7 @@
<title>Solråºåã³ãã¯ã·ã§ã³</title>
<p>Solråºåã³ãã¯ã·ã§ã³ã¿ã¤ãã¯ãSolr HTTP
APIãä»ãã¦Solrã«ã³ã³ãã³ããéãã¾ããã³ãã¯ã·ã§ã³ã¯Solrã®ããã©ã«ãå¤ã«ããã©ã«ãã§è¨å®ããã¾ããSolrã³ãã¯ã·ã§ã³ã¯ç´¢å¼å¯å¦ã«é¢ä¿ãªãããã¹ã¦ã®ã³ã³ãã³ããå¦çãã¾ããè¨å®ããããã¤ãã©ã¤ã³ãã³ã³ãã³ããå©ç¨ãããå¤æããã¯ãã§ãã</p>
<p>ãã ãããã¹ã¦ã®ã³ã³ãã³ããéãããããæ åã®ãããªå¤§ããªãã¡ã¤ã«ããã£ã«ã¿ãè¨å®ããªãã¨éããã¦ãã¾ããã·ã¹ãã ã«å¤§ããªè² è·ãæãã¦ãã¾ãã¾ããä¸è¶³ï¼ééã£ã¦ããè¨å®ãçºè¦ãã¦ãã®ãããªåé¡ãåé¿ããããã«ãSolrã³ãã¯ã·ã§ã³ã®ãã¹ã¦ã®ã¯ãã¼ã«çµæãã¬ãã¥ã¼ãããã¨ãæ¨å¥¨ãã¾ãã</p>
-
<p>Solråºåã³ãã¯ã·ã§ã³ãé¸æããã¨ã3ã¤ã®ã¿ãã表示ããã¾ããããµã¼ããã¿ãããHTTPã¿ã¼ã²ãããæå®ãããã¨ãã§ãã¾ãï¼</p>
+
<p>Solråºåã³ãã¯ã·ã§ã³ãé¸æããã¨ã5ã¤ã®ã¿ãã表示ããã¾ããããµã¼ããã¿ãããHTTPã¿ã¼ã²ãããæå®ãããã¨ãã§ãã¾ãï¼</p>
<br/><br/>
<figure src="images/ja_JP/solr-configure-server_ja_JP.PNG"
alt="Solr Configuration, Server tab" width="80%"/>
<br/><br/>
@@ -333,11 +333,17 @@
<br/><br/>
<figure src="images/ja_JP/solr-configure-schema_ja_JP.PNG"
alt="Solr Configuration, Schema tab" width="80%"/>
<br/><br/>
-
<p>ãå¼æ°ãã¿ãããã¯Solrã«éãä»»æã®å¼æ°ãæå®ãããã¨ãã§ãã¾ããSolrã®æ´æ°ãªã¯ã¨ã¹ãã«å©ç¨ã§ããä»»æã®å¼æ°ãå©ç¨ãããã¨ãã§ãã¾ããä¾ãã°ã<a
href="http://wiki.apache.org/solr/CommitWithin";>commitWithin=60000</a>ã¯ã³ã³ãã³ããæ大é
延60000msã§èªåçã«ã³ãããããããã«æå®ãã¾ãã<a
href="http://wiki.apache.org/solr/UpdateRequestProcessor";>update.chain=myChain</a>ã¯Solrã§ã³ã³ãã³ããå¦çãããã¤ãã©ã¤ã³ï¼ãã§ã¤ã³ãæå®ãã¾ãããã®ä»ã«æ�
�®å¯è½ãªå¼æ°ã«ä»ãã¦ã¯Solrã®ããã¥ã¢ã«ãåç
§ã«ãã¦ãã ãããã¿ãã¯ä»¥ä¸ã®ããã«è¡¨ç¤ºããã¾ãï¼</p>
+
<p>ãå¼æ°ãã¿ãããã¯Solrã«éãä»»æã®å¼æ°ãæå®ãããã¨ãã§ãã¾ããSolrã®æ´æ°ãªã¯ã¨ã¹ãã«å©ç¨ã§ããä»»æã®å¼æ°ãå©ç¨ãããã¨ãã§ãã¾ããããªãã¯ããã¨ãã°ãSolrã®ããã¥ã¡ã³ããå¦çããããã«ä½¿ç¨ããææ¸å¦çãã¤ãã©ã¤ã³/ãã§ã¼ã³ãé¸æããupdate.chain=
myChainã追å ãããã¨ãã§ãã¾ãããã®ä»ã«æå®å¯è½ãªå¼æ°ã«ä»ãã¦ã¯Solrã®ããã¥ã¢ã«ãåç
§ã«ãã¦ãã ããã
ã¿ãã¯ä»¥ä¸ã®ããã«è¡¨ç¤ºããã¾ãï¼</p>
<br/><br/>
<figure src="images/ja_JP/solr-configure-arguments_ja_JP.PNG"
alt="Solr Configuration, Arguments tab" width="80%"/>
<br/><br/>
<p>å¼æ°åã¨å¤ãå
¥åãã¦ãã追å ããã¿ã³ãæ¼ä¸ãã¦ãã ãããååãæ¢ã«åå¨ããå ´åã¯ãæ¢åã®å¤ã¯æ°ããæå®ããå¤ã§ç½®ãæããã¾ããå¼æ°ãåé¤ããå ´åã¯ãåé¤ããå¼æ°ã®å·¦ã«è¡¨ç¤ºããã¦ãããåé¤ããã¿ã³ãæ¼ä¸ãã¦ãã ããã</p>
+
<p>4çªç®ã®ã¿ãã¯ãããã¥ã¡ã³ãã®ãµã¤ãºãMIMEã¿ã¤ãã«åºã¥ãã¦ãã£ã«ã¿ãªã³ã°ãè¡ããã¨ãã§ãã¾ã"ããã¥ã¡ã³ã"ã¿ãã§ãããã¤ãåä½ã®æ大ããã¥ã¡ã³ãã®é·ããæå®ãããã¨ã«ãã£ã¦ãããªãã¯ãã®ãµã¤ãºï¼10
MBã¨åçã§ãä¾ãã°10485760ï¼ãè¶
ãã¦ããã¥ã¡ã³ãããã£ã«ã¿ãªã³ã°ãããã¨ãã§ãã¾ããããªããç¹å®ã®MIMEã¿ã¤ãã使ç¨ãã¦ããã¥ã¡ã³ãã追å ãããå
´åã¯ãï¼ãã¹ã¦ã®ææ¸ããHTMLããã£ã«ã¿ãªã³ã°ããããã«å¿
è¦ãªãä¾ãã°
"text /
htmlã®"ï¼"ãå«ã¾ãã¦MIMEã¿ã¤ã"ãã£ã¼ã«ãã«ããããå
¥åãããã¨ãã§ãã¾ãã
"MIMEã¿ã¤ãã®é¤å¤"ãã£ã¼ã«ãã¯ãç¹å®ã®MIMEã¿ã¤ãï¼JPEGç»åããã£ã«ã¿ãªã³ã°ããä¾ï¼
"image /
jpeg"ã«ï¼ã使ã£ã¦ææ¸ãé¤ãããã®ãã®ã§ããã¿ãã¯ä»¥ä¸ã®ããã«è¡¨ç¤ºããã¾ãï¼</p>
+ <figure src="images/ja_JP/solr-configure-documents_ja_JP.PNG"
alt="Solr Configuration, Documents tab" width="80%"/>
+ <br/><br/>
+
<p>5çªç®ã®ã¿ãã§ã¯ãã³ãããã®æ¦ç¥ãå¶å¾¡ãããã¨ãã§ãã¾ã"ã³ããã"ã¿ãã§ããåæ§ã«ãã¹ã¦ã®ã¸ã§ãã®çµäºæã«ããã¥ã¡ã³ããã³ãããããããã«ãããã©ã«ãã§æå¹ã«ãªã£ã¦ãããªãã·ã§ã³ã¯ãã¾ããããªç§åä½ã§ä¸å®æéï¼10ç§ä»¥å
ã«ã³ãããä¾ãã°"10000"ï¼å
ã®åããã¥ã¡ã³ããã³ããããããã¨ãã§ãã¾ããæ¦ç¥ã«ã³ãããã§ã¯ãªãManifoldCFã®Solrã«è²¬ä»»ãæ®ãã
¾ããããªãã¯Solrã®åºåæ¥ç¶ãä½æããã¨ãã«ã5ã¤ã®ã³ã³ãã£ã®ã¥ã¬ã¼ã·ã§ã³ã¿ãã表示ããã¾ãã</p>
+ <figure src="images/ja_JP/solr-configure-commits_ja_JP.PNG"
alt="Solr Configuration, Documents tab" width="80%"/>
+ <br/><br/>
<p>è¨å®ã®å
¥åãå®äºããå ´åã¯ããä¿åããã¿ã³ãæ¼ä¸ãã¦ãã ããã次ã®ãããªå
¥åããè¨å®ä¸è¦§ã表示ãã¾ãï¼</p>
<br/><br/>
<figure src="images/ja_JP/solr-status_ja_JP.PNG" alt="Solr
Status" width="80%"/>
Added:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-commits.PNG
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-commits.PNG?rev=1353758&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-commits.PNG
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-documents.PNG
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-documents.PNG?rev=1353758&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
manifoldcf/trunk/site/src/documentation/resources/images/en_US/solr-configure-documents.PNG
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-commits_ja_JP.PNG
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-commits_ja_JP.PNG?rev=1353758&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-commits_ja_JP.PNG
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-documents_ja_JP.PNG
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-documents_ja_JP.PNG?rev=1353758&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
manifoldcf/trunk/site/src/documentation/resources/images/ja_JP/solr-configure-documents_ja_JP.PNG
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
