Commit: 4e68acffee5720799755c9ea9483bb3c24216162 - pukiwiki-fork (git)

Commit MetaInfo

• Revisión: 4e68acffee5720799755c9ea9483bb3c24216162 (tree)
• Tiempo: 2016-11-25 03:17:15
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/692 Show search result details

Cambiar Resumen

• modified: lib/func.php
• modified: plugin/search.inc.php
• add: skin/search.js

Diferencia incremental

--- a/lib/func.php
+++ b/lib/func.php
@@ -269,6 +269,7 @@ function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 
 	ksort($pages, SORT_STRING);
 
+
 	$retval = '<ul>' . "\n";
 	foreach (array_keys($pages) as $page) {
 		$r_page  = rawurlencode($page);
@@ -286,6 +287,116 @@ function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 	return $retval;
 }
 
+function do_search_part($words, $start_index, $search_page_count)
+{
+//	echo 'aaa';
+//	print_r($words);
+//	echo 'bbb';
+	global $non_list;
+	$pages = get_existpages();
+	// Avoid
+	if ($base != '') {
+		$pages = preg_grep('/^' . preg_quote($base, '/') . '/S', $pages);
+	}
+	if (! $search_non_list) {
+		$pages = array_diff($pages, preg_grep('/' . $non_list . '/S', $pages));
+	}
+	$pages = array_flip($pages);
+	unset($pages[$whatsnew]);
+	$count = count($pages);
+	foreach (array_keys($pages) as $page) {
+		if (! check_readable($page, false, false)) {
+			unset($pages[$page]);
+			--$count;
+		}
+	}
+	$found_pages = array();
+	$i = 0;
+	$end_index = $start_index + $search_page_count;
+	$last_index = -1;
+	$last_search_page = '';
+	$next_search_index = -1;
+	foreach (array_keys($pages) as $page) {
+		if (($index = $i++) < $start_index) {
+			continue;
+		}
+		if ($end_index <= $index) {
+			$next_search_index = $index;
+			break;
+		}
+		$last_index = $index;
+		$last_search_page = $page;
+		$page_result = do_search_singlepage($words, $page);
+		if ($page_result === FALSE) {
+			continue;
+		}
+		$found_pages[] = $page_result;
+	}
+	$result = array(
+		'start_index' => $start_index,
+		'last_index' => $last_index,
+		'last_search_page' => $last_search_page, 
+	  'end_index' => $end_index,
+		'found_pages' => $found_pages,
+		'total_page_count' => count($pages),
+		'q' => $words
+	);
+	if ($next_search_index >= 0) {
+		$result['next_search_index'] = $next_search_index;
+	}
+	return $result;
+}
+
+function do_search_singlepage($words, $page) {
+	$max_lines = 20;
+	$prevlines = 2;
+	$extralines = 2;
+	$lines = get_source($page, TRUE, FALSE);
+	$result_lines = array();
+	$last_added_index = -1;
+	$last_found_index = -1;
+	foreach ($lines as $i => $line) {
+		if (search_words($words, $line)) {
+			for ($j = max($i - $prevlines, $last_added_index + 1); $j < $i; $j++) {
+				$result_lines[] = array('index' => $j, 'line' => $lines[$j]);
+			}
+			$result_lines[] = array('index' => $i, 'line' => $line);
+			$last_found_index = $i;
+			$last_added_index = $i;
+		} else {
+			if ($last_found_index >= 0 &&
+				$i <= $last_found_index + $extralines) {
+				$result_lines[] = array('index' => $i, 'line' => $line);
+				$last_added_index = $i;
+			}
+		}
+		if (count($result_lines) > $max_lines) {
+			break;
+		}
+	}
+	$link = get_script_uri() . '?' . pagename_urlencode($page); 
+	if (count($result_lines) > 0) {
+		return array(
+			'page' => $page,
+			'lines' => $result_lines,
+			'link' => $link
+			);
+	} else {
+		return FALSE;
+	}
+}
+
+function search_words($words, $target) {
+	$qwords = preg_quote($words, '/');
+	$m = null;
+	if (preg_match('/' . $qwords . '/i', $target, $m)) {
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+
 // Argument check for program
 function arg_check($str)
 {

--- a/plugin/search.inc.php
+++ b/plugin/search.inc.php
@@ -29,6 +29,13 @@ function plugin_search_action()
 {
 	global $post, $vars, $_title_result, $_title_search, $_msg_searching;
 
+	if (isset($vars['action']) && $vars['action'] === 'list') {
+		header('Content-Type: applicaton/json');
+		$result = do_search_part($vars['q'], 0, 10);
+		$json = json_encode($result, JSON_UNESCAPED_UNICODE);
+		echo($json);
+		exit;
+	}
 	if (PLUGIN_SEARCH_DISABLE_GET_ACCESS) {
 		$s_word = isset($post['word']) ? htmlsc($post['word']) : '';
 	} else {
@@ -56,6 +63,7 @@ function plugin_search_action()
 	// Show search form
 	$bases = ($base == '') ? array() : array($base);
 	$body .= plugin_search_search_form($s_word, $type, $bases);
+	$body .= '<script src="skin/search.js"></script>' . "\n";
 
 	return array('msg'=>$msg, 'body'=>$body);
 }

--- /dev/null
+++ b/skin/search.js
@@ -0,0 +1,63 @@
+window.addEventListener && window.addEventListener('load', function() {
+  'use strict';
+  var xhr = new XMLHttpRequest();
+  xhr.responseType = 'json';
+  xhr.onload = function(e) {
+    console.log('status: ' + e);
+    console.log(e);
+    var searchResult = xhr.response;
+    console.log(searchResult);
+    addResultArea();
+    addSearchResults(searchResult.found_pages);
+  };
+  console.log(xhr);
+  console.log('aaa');
+  xhr.open('POST', 'http://localhost:8070/pwd/b2390/', true);
+  console.log('bbb');
+  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+  xhr.send('q=bug&cmd=search&action=list&start=0');
+
+  function addSearchResults(resultList) {
+    var ul = document.querySelector('#search_result_ul');
+    resultList.forEach(function(value, index) {
+      addSearchResult(ul, value);
+    });
+
+  }
+  function getLinedText(data) {
+    var lines = [];
+    data.lines.forEach(function(item) {
+      lines.push('' + (item.index + 1) + ':' + item.line);
+    });
+    return lines.join('');
+  }
+  function addSearchResult(ul, data) {
+    // <li>
+    var a = document.createElement('a');
+    var aLabel = document.createTextNode(data.page);
+    a.href = data.link;
+    a.appendChild(aLabel);
+    var li = document.createElement('li');
+    li.appendChild(a);
+    ul.appendChild(li);
+    // <pre>
+    var pre = document.createElement('pre');
+    //var preText = document.createTextNode(getLinedText(data));
+    pre.innerHTML = getLinedText(data);
+    //pre.appendChild(preText);
+    ul.appendChild(pre);
+  }
+  function addResultArea() {
+    var bodyDiv = document.querySelector('div#body');
+    // <hr>
+    var hr = document.createElement('hr');
+    hr.className = 'full_hr';
+    //var hr
+    bodyDiv.insertBefore(hr, bodyDiv.childNodes[0]);
+
+    // <ul>
+    var ul = document.createElement('ul');
+    ul.id = 'search_result_ul';
+    bodyDiv.insertBefore(ul, hr);
+  }
+});