last.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5024 c91229c3-7414-0410-bfa2-8a42b809f60b

last.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5024 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 383af810
Showing 13 changed files with 127 additions and 29 deletions
kthelp/ktcore/EN/browse.html
kthelp/ktcore/EN/search.html
plugins/ktcore/KTDashlets.php
plugins/ktstandard/contents/BaseIndexer.php
plugins/ktstandard/contents/OpenDocumentIndexer.php
plugins/ktstandard/contents/PdfIndexer.php
plugins/ktstandard/contents/PowerpointIndexer.php
plugins/ktstandard/contents/PsIndexer.php
plugins/ktstandard/contents/TextIndexer.php
plugins/ktstandard/contents/WordIndexer.php
templates/kt3/portlets/search_portlet.smarty
templates/ktcore/dashlets/indexer_status.smarty
templates/ktstandard/action/discussion_thread_list_item.smarty
@@ -29,7 +29,7 @@ permissions-based, so the system only returns items that the logged in user is
 allowed to access. </p>
 <p> </p>
 <h5>Simple (quick) search</h5>
-<p>Specify a search term to search all text  including 
+<p>Specify a search term to search all text - including 
 document metadata and the contents of the following file types (if your 
 administrator has configured these options): MS Word, MS Excel, MS PowerPoint, 
 Adobe PDF, and Plain Text files.</p>
+<html>
+<head><title>Search</title></head>
+<body>
+<h2>Search</h2>
+<p>KnowledgeTree provides three versatile search options  
+simple (quick) search, advanced search, and saved searches. Search is 
+permissions-based, so the system only returns items that the logged in user is 
+allowed to access. </p>
+
+<p>Specify a search term to search all text - including 
+document metadata and the contents of the following file types (if your 
+administrator has configured these options): MS Word, MS Excel, MS PowerPoint, 
+Adobe PDF, and Plain Text files.</p>
+
+<p><strong>Please Note:</strong> words shorter than 4 characters long (e.g. "the" or 
+"for") are discarded from the search.  Search also only ever returns fully matching words
+(e.g. "Know" will <strong>not</strong> match "KnowledgeTree").</p>
+</body>
+</html>
 \ No newline at end of file
@@ -171,17 +171,11 @@ class KTIndexerStatusDashlet extends KTBaseDashlet {
                 }
                 $oTrigger = new $sTrigger;
-                $sCommand = KTUtil::findCommand($oTrigger->commandconfig, $oTrigger->command);
-                $sFriendly = $oTrigger->getFriendlyCommand();
-                
-                // check that we do not specify inactivity.
-                if ($sFriendly === false) { $sCommand = null; }
-                // otherwise check for friendly name.
-                else if (!is_null($sFriendly)) { $sCommand = $sFriendly; }
-                else if ($sCommand) { $sCommand = sprintf(_('<strong>command:</strong> %s'), $sCommand); }
-                
-                // only worry about _broken_ triggers.
-                if (!empty($sCommand)) { continue; }
+                $sDiagnostic = $oTrigger->getDiagnostic();
+                // empty is OK.
+                if (is_null($sDiagnostic) || ($sDiagnostic == false)) {
+                    continue;
+                }
                 $aTypes = (array) $oTrigger->mimetypes;
                 $aTypesStr = array();
@@ -191,7 +185,7 @@ class KTIndexerStatusDashlet extends KTBaseDashlet {
                     //}
                 }
-                $aTriggerSet[] = array('types' => $aTypesStr, 'command' => $sCommand);
+                $aTriggerSet[] = array('types' => $aTypesStr, 'diagnostic' => $sDiagnostic);
             }
         }
@@ -35,10 +35,11 @@ class KTBaseIndexerTrigger {
      * If it is false, the temporary file will be sent as the last
      * parameter.
      */
-    var $use_pipes = true;
-
-    function getFriendlyCommand() {
-        return null; // _('Built-in')
+    var $use_pipes = true; 
+    
+    /* return a diagnostic string _if_ there is something wrong.  NULL otherwise. */
+    function getDiagnostic() {
+        return null;
     }
     function setDocument($oDocument) {
@@ -40,6 +40,22 @@ class KTOpenDocumentIndexerTrigger extends KTBaseIndexerTrigger {
         }
         return _('Built-in');
     }
+    
+    function findLocalCommand() {
+        $sCommand = KTUtil::findCommand("import/unzip", "unzip");
+        return $sCommand;
+    }    
+
+    function getDiagnostic() {
+        $sCommand = $this->findLocalCommand();
+        
+        // can't find the local command.
+        if (empty($sCommand)) {
+            return sprintf(_('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the KnowledgeTree Path.  For more information on indexers and helper applications, please <a href="%s">visit the KTDMS site</a>.'), $this->command, $this->support_url);
+        }
+        
+        return null;
+    }
     function extract_contents($sFilename, $sTmpFilename) {
         $sUnzipCommand = KTUtil::findCommand("import/unzip", "unzip");
@@ -12,6 +12,22 @@ class KTPdfIndexerTrigger extends KTBaseIndexerTrigger {
     var $use_pipes = false;
     // see BaseIndexer for how the extraction works.
+    function findLocalCommand() {   
+        $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
+        return $sCommand;
+    }    
+    
+    function getDiagnostic() {
+        $sCommand = $this->findLocalCommand();
+        
+        // can't find the local command.
+        if (empty($sCommand)) {
+            return sprintf(_('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the KnowledgeTree Path.  For more information on indexers and helper applications, please <a href="%s">visit the KTDMS site</a>.'), $this->command, $this->support_url);
+        }
+        
+        return null;
+    }
+    
 }
 ?>
@@ -9,7 +9,22 @@ class KTPowerpointIndexerTrigger extends KTBaseIndexerTrigger {
     var $args = array();
     var $use_pipes = true;
-    // see BaseIndexer for how the extraction works.
+    function findLocalCommand() {   
+        $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
+        return $sCommand;
+    }    
+    
+    function getDiagnostic() {
+        $sCommand = $this->findLocalCommand();
+        
+        // can't find the local command.
+        if (empty($sCommand)) {
+            return sprintf(_('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the KnowledgeTree Path.  For more information on indexers and helper applications, please <a href="%s">visit the KTDMS site</a>.'), $this->command, $this->support_url);
+        }
+        
+        return null;
+    }
+
 }
 ?>
@@ -11,7 +11,21 @@ class KTPostscriptIndexerTrigger extends KTBaseIndexerTrigger {
     var $args = array();
     var $use_pipes = true;
-    // see BaseIndexer for how the extraction works.
+    function findLocalCommand() {   
+        $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
+        return $sCommand;
+    }    
+    
+    function getDiagnostic() {
+        $sCommand = $this->findLocalCommand();
+        
+        // can't find the local command.
+        if (empty($sCommand)) {
+            return sprintf(_('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the KnowledgeTree Path.  For more information on indexers and helper applications, please <a href="%s">visit the KTDMS site</a>.'), $this->command, $this->support_url);
+        }
+        
+        return null;
+    }
 }
 ?>
@@ -8,9 +8,7 @@ class KTTextIndexerTrigger extends KTBaseIndexerTrigger {
        'text/csv' => true,
     );
-    function getFriendlyCommand() {
-        return _('Built-in');
-    }
+    // no need for diagnostic - this is always available.
     function extract_contents($sFilename, $sTempFilename) {
         $contents = file_get_contents($sFilename);
@@ -19,6 +19,28 @@ class KTWordIndexerTrigger extends KTBaseIndexerTrigger {
         }
         return parent::extract_contents($sFilename, $sTempFilename);
     }
+    
+    function findLocalCommand() {
+        if (OS_WINDOWS) {
+            $this->command = 'c:\antiword\antiword.exe';
+            $this->commandconfig = 'indexer/antiword';
+            $this->args = array();
+        }
+        
+        $sCommand = KTUtil::findCommand($this->commandconfig, $this->command);
+        return $sCommand;
+    }
+    
+    function getDiagnostic() {
+        $sCommand = $this->findLocalCommand();
+        
+        // can't find the local command.
+        if (empty($sCommand)) {
+            return sprintf(_('Unable to find required command for indexing.  Please ensure that <strong>%s</strong> is installed and in the KnowledgeTree Path.  For more information on indexers and helper applications, please <a href="%s">visit the KTDMS site</a>.'), $this->command, $this->support_url);
+        }
+        
+        return null;
+    }
 }
 ?>
 <form action="{$rootUrl}/search/simpleSearch.php" method="GET">
 <input type="text" name="fSearchableText" id="portlet-search-text" size="15" /><input type="submit" value="{i18n}search{/i18n}" class="searchbutton" />
 </form>
+<p><a href="{ktLink base="help.php" subpath="ktcore/search.html"}" class="ktInline ktHelp" style="float: left; margin: 0 0.5em 0.5em 5px;" >{i18n}How do I search?{/i18n}</a>
+{i18n}How do I search?{/i18n}</p>
 {if (!empty($saved_searches))}
 <h4>Saved Searches</h4>
@@ -5,26 +5,27 @@
 no active indexers registered.  No content indexing will occur.{/i18n}</p></div>
 {else}
 {if empty($transforms)} 
-<div class="ktInfo"><p>All indexers should be working correctly.</p></div>
+<div class="ktInfo"><p>{i18n}All indexers claim to be working correctly.{/i18n}</p></div>
 {else}
 <table class="kt_collection">
 <thead>
     <tr>
         <th>Mime Types</th>
-        <th>Command</th>
+        <th>Diagnostic</th>
     </tr>
 </thead>
 <tbody>
     {foreach item=aRow from=$transforms}
     <tr class="browse_column {cycle values=odd,even}">
-        <td>
+        <td><p>
             {foreach key=mimetype item=v from=$aRow.types name=mimetype}
             {$mimetype} {if (!$smarty.foreach.mimetype.last)}<br />{/if}
             {/foreach}
+            </p>
         </td>
-        <td>{if empty($aRow.command)}
-        <p class="important descriptiveText">{i18n}No indexer.{/i18n}</p>
-        {else}{$aRow.command}{/if}</td>
+        <td class="title">
+        <p class="descriptiveText">{if empty($aRow.diagnostic)}{i18n}No indicated problem.{/i18n} {else}{$aRow.diagnostic}{/if}</p>
+       </td>
     </tr>
     {/foreach}
 </tbody>
@@ -4,5 +4,5 @@
   <td>{$thread->getNumberOfViews()}</td>
   <td>{$thread->getNumberOfReplies()}</td>
   <td>{$last_comment->getDate()}</td>
-  <td>{if $thread->getState()}Closed at metadata version {$thread->getCloseMetadataVersion()}{else}Open{/if}</td>
+  <td>{if $thread->getState()}Closed at metadata version {$thread->getCloseMetadataVersion()}. <br /><strong>Reason:</strong> {$thread->getCloseReason()}{else}Open{/if}</td>
 </tr>