提交: 24d41c08b07aad809d778766c26d41217759727a - pukiwiki-fork (git)

Commit MetaInfo

• 修订版: 24d41c08b07aad809d778766c26d41217759727a (tree)
• 时间: 2017-09-20 00:35:36
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

Improve author line related proc / Speed up get_source raw

更改概述

• modified: lib/file.php
• modified: lib/func.php
• modified: lib/link.php
• modified: plugin/search2.inc.php

差异

--- a/lib/file.php
+++ b/lib/file.php
@@ -15,9 +15,16 @@ define('PKWK_MAXSHOW_CACHE', 'recent.dat');
 // AutoLink
 define('PKWK_AUTOLINK_REGEX_CACHE', 'autolink.dat');
 
-// Get source(wiki text) data of the page
-// Returns FALSE if error occurerd
-function get_source($page = NULL, $lock = TRUE, $join = FALSE)
+/**
+ * Get source(wiki text) data of the page
+ *
+ * @param $page page name
+ * @param $lock lock
+ * @param $join true: return string, false: return array of string
+ * @param $raw true: return file content as-is
+ * @return FALSE if error occurerd
+ */
+function get_source($page = NULL, $lock = TRUE, $join = FALSE, $raw = FALSE)
 {
 	//$result = NULL;	// File is not found
 	$result = $join ? '' : array();
@@ -44,6 +51,9 @@ function get_source($page = NULL, $lock = TRUE, $join = FALSE)
 			} else {
 				$result = fread($fp, $size);
 				if ($result !== FALSE) {
+					if ($raw) {
+						return $result;
+					}
 					// Removing Carriage-Return
 					$result = str_replace("\r", '', $result);
 				}
@@ -204,16 +214,54 @@ function remove_author_info($wikitext)
 	return preg_replace('/^\s*#author\([^\n]*(\n|$)/m', '', $wikitext);
 }
 
-function remove_author_lines($lines)
+/**
+ * Remove author line from wikitext
+ */
+function remove_author_header($wikitext)
 {
-	$author_head = '#author(';
-	$len = strlen($author_head);
-	for ($i = 0; $i < 5; $i++) {
-		if (substr($lines[$i], 0, $len) === $author_head) {
-			unset($lines[$i]);
+	$start = 0;
+	while (($pos = strpos($wikitext, "\n", $start)) != false) {
+		$line = substr($wikitext, $start, $pos);
+		$m = null;
+		if (preg_match('/^#author\(/', $line, $m)) {
+			// fond #author line, Remove this line only
+			if ($start === 0) {
+				return substr($wikitext, $pos + 1);
+			} else {
+				return substr($wikitext, 0, $start - 1) .
+					substr($wikitext, $pos + 1);
+			}
+		} else if (preg_match('/^#freeze(\W|$)/', $line, $m)) {
+			// Found #freeze still in header
+		} else {
+			// other line, #author not found
+			return $wikitext;
+		}
+		$start = $pos + 1;
+	}
+	return $wikitext;
+}
+
+/**
+ * Get author info from wikitext
+ */
+function get_author_info($wikitext)
+{
+	$start = 0;
+	while (($pos = strpos($wikitext, "\n", $start)) != false) {
+		$line = substr($wikitext, $start, $pos);
+		$m = null;
+		if (preg_match('/^#author\(/', $line, $m)) {
+			return $line;
+		} else if (preg_match('/^#freeze(\W|$)/', $line, $m)) {
+			// Found #freeze still in header
+		} else {
+			// other line, #author not found
+			return false;
 		}
+		$start = $pos + 1;
 	}
-	return $lines;
+	return false;
 }
 
 function get_date_atom($timestamp)

--- a/lib/func.php
+++ b/lib/func.php
@@ -346,8 +346,8 @@ function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
 
 		// Search for page contents
 		foreach ($keys as $key) {
-			$lines = remove_author_lines(get_source($page, TRUE, FALSE));
-			$b_match = preg_match($key, join('', $lines));
+			$body = get_source($page, TRUE, TRUE, TRUE);
+			$b_match = preg_match($key, remove_author_header($body));
 			if ($b_type xor $b_match) break; // OR
 		}
 		if ($b_match) continue;

--- a/lib/link.php
+++ b/lib/link.php
@@ -266,8 +266,8 @@ function links_do_search_page($word)
 		$b_match = FALSE;
 		// Search for page contents
 		foreach ($keys as $key) {
-			$lines = remove_author_lines(get_source($page, TRUE, FALSE));
-			$b_match = preg_match($key, join('', $lines));
+			$body = get_source($page, TRUE, TRUE, TRUE);
+			$b_match = preg_match($key, remove_author_header($body));
 			if (! $b_match) break; // OR
 		}
 		if ($b_match) continue;

--- a/plugin/search2.inc.php
+++ b/plugin/search2.inc.php
@@ -106,10 +106,8 @@ function plugin_search2_do_search($query_text, $base, $start_index)
 			$saved_scan_start_index = $scan_page_index;
 		}
 		// Search for page name and contents
-		$raw_lines = get_source($page, TRUE, FALSE);
-		$lines = remove_author_lines($raw_lines);
-		$body = join('', $raw_lines);
-		$target = $page . '\n' . join('', $lines);
+		$body = get_source($page, TRUE, TRUE, TRUE);
+		$target = $page . "\n" . remove_author_header($body);
 		foreach ($keys as $key) {
 			$b_match = preg_match($key, $target);
 			if ($b_type_and xor $b_match) break; // OR
@@ -123,7 +121,7 @@ function plugin_search2_do_search($query_text, $base, $start_index)
 					'pagename_only' => 1);
 			} else {
 				$found_pages[] = array('name' => (string)$page,
-				'url' => get_page_uri($page), 'body' => (string)$body);
+					'url' => get_page_uri($page), 'body' => (string)$body);
 			}
 		}
 		$last_read_page_name = $page;