Merge pull request #149 from ContentsViewer/pre

関連ページ調整. タイトルからタグ提示

Author: ContentsViewer

Client/ContentsViewer/ContentsViewerStandard.css

@@ -768,7 +768,10 @@ ul.tagline li a:visited {
   -webkit-transition: 0.2s;
   transition: 0.2s;
 }
-
+ul.tagline li.suggested a,
+ul.tagline li.suggested a:visited{
+  opacity: 0.5;
+}
 ul.tagline li a::before {
   position: absolute;
   top: 0;
@@ -782,7 +785,6 @@ ul.tagline li a::before {
   -webkit-transition: 0.2s;
   transition: 0.2s;
 }
-
 ul.tagline li a::after {
   position: absolute;
   top: 50%;
@@ -1997,8 +1999,7 @@ a.directory .name, a.file .name{
     background-color: var(--tag-background-color);
   }
   [theme="dark"] ul.tagline li a:not(:hover)::before {
-    border-color: transparent var(--tag-background-color) transparent
-      transparent;
+    border-color: transparent var(--tag-background-color) transparent transparent;
   }
   [theme="dark"] ul.tag-list > li > a:not(:hover) > span {
     background-color: var(--tag-background-color);

Frontend/contents-viewer.php

@@ -48,7 +48,7 @@
 $vars['layerName'] = $out['layerName'];
 $vars['language'] = $out['language'];
 $vars['layerSelector'] = CreateRelatedLayerSelector($contentPath);
-
+$layerSuffix = ContentsDatabaseManager::GetLayerSuffix($vars['layerName']);
 
 // テキストの読み込み
 $stopwatch->Start();
@@ -152,12 +152,27 @@
 
 // End navigator 作成 ------------------------------------------------
 
-
 // メタデータの更新
 // contentsChangedTime がここで更新される
 ContentsDatabaseManager::RegistMetadata($currentContent);
 ContentsDatabase::SaveMetadata($metaFileName);
 
+$suggestedTags = [];
+if(SearchEngine\Index::Load(
+    CONTENTS_HOME_DIR . $vars['rootDirectory'] . '/.index.tagmap' . $layerSuffix
+)){
+    $titleQuery = NotBlankText(
+        [$currentContent->title, ContentsDatabaseManager::GetContentPathInfo($currentContent->path)['filename']]
+    );
+    $suggestions = SearchEngine\Searcher::Search($titleQuery);
+    foreach($suggestions as $i => $suggested){
+        if($suggested['score'] < 0.8 || in_array($suggested['id'], $currentContent->tags, true)){
+            continue;
+        }
+        $suggestedTags[] = $suggested['id'];
+    }
+}
+
 // インデックスの読み込み
 ContentsDatabaseManager::LoadRelatedIndex($contentPath);
 
@@ -208,6 +223,7 @@
 
 // tagline の設定
 $vars['tagline']['tags'] = $currentContent->tags;
+$vars['tagline']['suggestedTags'] = $suggestedTags;
 
 // content summary の設定
 $vars['contentSummary'] = $currentContent->summary;

Frontend/related-viewer.php

@@ -30,21 +30,16 @@
 $vars['rootContentPath'] = ContentsDatabaseManager::GetRelatedRootFile($vars['contentPath']);
 $vars['rootDirectory'] = substr(GetTopDirectory($vars['rootContentPath']), 1);
 
-
 // ContentsDatabaseManager::LoadRelatedMetadata($vars['rootContentPath']);
 // $tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
 // $path2tag = array_key_exists('path2tag', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['path2tag'] : [];
 // ksort($tag2path);
 
-
 // layerの再設定
 $out = UpdateLayerNameAndResetLocalization($vars['contentPath'], $vars['layerName'], $vars['language']);
 $vars['layerName'] = $out['layerName'];
 $vars['language'] = $out['language'];
-
-
-$indexFilePath = ContentsDatabaseManager::GetRelatedIndexFileName($contentPath);
-SearchEngine\Index::Load($indexFilePath);
+$layerSuffix = ContentsDatabaseManager::GetLayerSuffix($vars['layerName']);
 
 
 $parent = $currentContent->Parent();
@@ -59,6 +54,7 @@
 }
 
 // === 関連コンテンツの検索 =================================================
+$titleTagSuggestions = [];
 $titleSuggestions = [];
 
 /**
@@ -68,24 +64,49 @@
  * ]
  */
 $tagSuggestions = [];
-
 $countSuggestions = 0;
 
+
 // "<title> <parent.title> で検索
 // ただし, parent は rootではない
-$titleQuery = NotBlankText(
+$title = NotBlankText(
     [$currentContent->title, ContentsDatabaseManager::GetContentPathInfo($currentContent->path)['filename']]
 );
+
+if(SearchEngine\Index::Load(
+    CONTENTS_HOME_DIR . $vars['rootDirectory'] . '/.index.tagmap' . $layerSuffix
+)){
+    $suggestions = SearchEngine\Searcher::Search($title);
+    foreach($suggestions as $i => $suggested){
+        if($suggested['score'] < 0.8 || in_array($suggested['id'], $currentContent->tags, true)){
+            continue;
+        }
+        $titleTagSuggestions[] = ['tag' => $suggested['id'], 'suggestions' => []];
+    }
+}
+
+SearchEngine\Index::Load(ContentsDatabaseManager::GetRelatedIndexFileName($contentPath));
+
+$titleQuery = $title;
 if($parent !== false){
     $parentPathInfo = ContentsDatabaseManager::GetContentPathInfo($parent->path);
     if($parentPathInfo['filename'] != ROOT_FILE_NAME){
-        $titleQuery .= ' ' . NotBlankText([$parent->title, $parentPathInfo['filename']]);
+        $titleQuery = NotBlankText([$parent->title, $parentPathInfo['filename']]) . ' ' . $titleQuery;
     }
 }
-$titleSuggestions = SelectSuggestions(
-    SearchEngine\Searcher::Search($titleQuery), $currentContent->path, $childPathList, 0.5
-);
-$countSuggestions += count($titleSuggestions);
+if($title !== $titleQuery || count($titleTagSuggestions) <= 0){
+    $titleSuggestions = SelectSuggestions(
+        SearchEngine\Searcher::Search($titleQuery), $currentContent->path, $childPathList, 0.5
+    );
+    $countSuggestions += count($titleSuggestions);
+}
+
+foreach ($titleTagSuggestions as $i => $each) {
+    $titleTagSuggestions[$i]['suggestions'] = SelectSuggestions(
+        SearchEngine\Searcher::Search($each['tag']), $currentContent->path, $childPathList
+    );
+    $countSuggestions += count($titleTagSuggestions[$i]['suggestions']);
+}
 
 // <tag1> <tag2> <tag3> ..."で検索
 foreach($currentContent->tags as $tag){
@@ -176,12 +197,19 @@
     $body .= '</div>';
 }
 
+foreach($titleTagSuggestions as $each){
+    if(count($each['suggestions']) > 0){
+        $body .= '<h2>"' . $each['tag'] . '"</h2><div class="section">';
+        $body .= CreateTagLine($each['tag'], $vars['rootDirectory'], $vars['layerName']);
+        $body .= CreateSuggestedContentList($each['suggestions']);
+        $body .= '</div>';
+    }
+}
+
 foreach($tagSuggestions as $each){
-    if(count($each['suggestions'])){
+    if(count($each['suggestions']) > 0){
         $body .= '<h2>"' . $each['tag'] . '"</h2><div class="section">';
-        $body .= '<ul class="tagline" style="text-align: right;"><li><a href="' . 
-            CreateTagMapHREF([[$each['tag']]], $vars['rootDirectory'], $vars['layerName']) .
-            '">' . $each['tag'] . '</a></li></ul>';
+        $body .= CreateTagLine($each['tag'], $vars['rootDirectory'], $vars['layerName']);
         $body .= CreateSuggestedContentList($each['suggestions']);
         $body .= '</div>';
     }
@@ -299,4 +327,10 @@ function CreateSuggestedContentList($suggestions){
     }
     $html .= '</ul>';
     return $html;
+}
+
+function CreateTagLine($tag, $rootDirectory, $layerName){
+    return '<ul class="tagline" style="text-align: right;"><li><a href="' . 
+            CreateTagMapHREF([[$tag]], $rootDirectory, $layerName) .
+            '">' . $tag . '</a></li></ul>';
 }

Frontend/viewer.php

@@ -23,7 +23,7 @@
  *  $vars['addEditLink']
  *  $vars['openNewTabEditLink']
  *  $vars['fileDate'] = ['createdTime' => '', 'modifiedTime' => '']
- *  $vars['tagline']['tags']
+ *  $vars['tagline'] = ['tags' => [], 'suggestedTags' => []]
  *  $vars['tagList']
  *  $vars['latestContents']
  *  $vars['leftContent'] = ['title' => '', 'url' => '']
@@ -159,9 +159,16 @@
 
         <?php if (isset($vars['tagline'])): ?>
         <ul class="tagline">
+          <?php if (isset($vars['tagline']['tags'])): ?>
           <?php foreach ($vars['tagline']['tags'] as $tag): ?>
           <li><a href='<?=CreateTagMapHREF([[$tag]], $vars['rootDirectory'], $vars['layerName'])?>'><?=$tag?></a></li>
           <?php endforeach; ?>
+          <?php endif;?>
+          <?php if (isset($vars['tagline']['suggestedTags'])): ?>
+          <?php foreach ($vars['tagline']['suggestedTags'] as $tag): ?>
+          <li class="suggested"><a href='<?=CreateTagMapHREF([[$tag]], $vars['rootDirectory'], $vars['layerName'])?>'><?=$tag?></a></li>
+          <?php endforeach; ?>
+          <?php endif;?>
         </ul>
         <?php endif;?>