| |
Index: trunk/wb/search/search.php
===================================================================
--- trunk/wb/search/search.php (revision 768)
+++ trunk/wb/search/search.php (revision 769)
@@ -193,6 +193,11 @@
} else { $fetch_cfg_enable_flush['value'] = 'false'; }
if($fetch_cfg_enable_flush['value'] == 'false') { $cfg_enable_flush = false;
} else { $cfg_enable_flush = true; }
+$query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'time_limit' LIMIT 1"); // time-limit per module
+if($query->numRows() > 0) { $fetch_search_time_limit = $query->fetchRow();
+} else { $fetch_search_time_limit['value'] = 'false'; }
+$search_time_limit = (int)($fetch_search_time_limit['value']);
+if($search_time_limit < 1) $search_time_limit = 0;
// Replace vars in search settings with values
$vars = array('[SEARCH_STRING]', '[WB_URL]', '[PAGE_EXTENSION]', '[TEXT_RESULTS_FOR]');
$values = array($search_display_string, WB_URL, PAGE_EXTENSION, $TEXT['RESULTS_FOR']);
@@ -309,6 +314,7 @@
$seen_pages = array(); // seen pages per module.
$pages_listed = array(); // seen pages.
foreach($sorted_modules AS $module_name) {
+ $start_time = time(); // get start-time to check time-limit; not very accurate, but ok
$seen_pages[$module_name] = array();
if(!isset($search_funcs[$module_name])) {
continue; // there is no search_func for this module
@@ -326,6 +332,10 @@
");
if($sections_query->numRows() > 0) {
while($res = $sections_query->fetchRow()) {
+ // check if time-limit is exceeded for this module
+ if($search_time_limit > 0 && (time()-$start_time > $search_time_limit)) {
+ break;
+ }
// Only show this section if it is not "out of publication-date"
$now = time();
if( !( $now<$res['publ_end'] && ($now>$res['publ_start'] || $res['publ_start']==0) ||
Index: trunk/wb/search/search_modext.php
===================================================================
--- trunk/wb/search/search_modext.php (revision 768)
+++ trunk/wb/search/search_modext.php (revision 769)
@@ -95,7 +95,7 @@
// stop-sign: .!?; + DOUBLE EXCLAMATION MARK - INTERROBANG - EXCLAMATION QUESTION MARK - QUESTION EXCLAMATION MARK - DOUBLE QUESTION MARK - HALFWIDTH IDEOGRAPHIC FULL STOP - IDEOGRAPHIC FULL STOP - IDEOGRAPHIC COMMA
$str2=".!?;"."\xE2\x80\xBC"."\xE2\x80\xBD"."\xE2\x81\x89"."\xE2\x81\x88"."\xE2\x81\x87"."\xEF\xBD\xA1"."\xE3\x80\x82"."\xE3\x80\x81";
$regex='/(?:^|\b|['.$str1.'])([^'.$str1.']{0,200}?'.$word.'[^'.$str2.']{0,200}(?:['.$str2.']|\b|$))/Sisu';
- if(version_compare(PHP_VERSION, '4.3.3', '>=') == 1) {
+ if(version_compare(PHP_VERSION, '4.3.3', '>=')) {
// jump from match to match, get excerpt, stop if $max_excerpt_num is reached
$last_end = 0; $offset = 0;
while(preg_match('/'.$word.'/Sisu', $text, $match_array, PREG_OFFSET_CAPTURE, $last_end)) {
@@ -232,7 +232,6 @@
{ return false; }
if($mod_no_highlight) // no highlighting
{ $mod_page_link_target = "&nohighlight=1".$mod_page_link_target; }
-
// clean the text:
$mod_text = str_replace(array("\x0D","\x0A"), ' ', $mod_text);
$mod_text = preg_replace('#<(!--.*--|style.*#SiU', ' ', $mod_text);
Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php (revision 768)
+++ trunk/wb/install/save.php (revision 769)
@@ -626,6 +626,10 @@
$search_max_excerpt = addslashes('15');
$insert_search_max_excerpt = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'max_excerpt', '$search_max_excerpt', '')";
$database->query($insert_search_max_excerpt);
+ // max time to search per module
+ $search_time_limit = addslashes('0');
+ $insert_search_time_limit = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'time_limit', '$search_time_limit', '')";
+ $database->query($insert_search_time_limit);
// some config-elements
$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_enable_old_search', 'true', '')");
$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_search_keywords', 'true', '')");
Index: trunk/wb/languages/FI.php
===================================================================
--- trunk/wb/languages/FI.php (revision 768)
+++ trunk/wb/languages/FI.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Merkistö';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php (revision 768)
+++ trunk/wb/languages/EN.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset';
$TEXT['MODULE_ORDER'] = 'Module-order for searching';
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt';
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module';
$TEXT['PUBL_START_DATE'] = 'Start date';
$TEXT['PUBL_END_DATE'] = 'End date';
$TEXT['CALENDAR'] = 'Calender';
Index: trunk/wb/languages/CS.php
===================================================================
--- trunk/wb/languages/CS.php (revision 768)
+++ trunk/wb/languages/CS.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Kódová stránka';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/SE.php
===================================================================
--- trunk/wb/languages/SE.php (revision 768)
+++ trunk/wb/languages/SE.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Typsnitt';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/ES.php
===================================================================
--- trunk/wb/languages/ES.php (revision 768)
+++ trunk/wb/languages/ES.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Conjunto de Caraceteres';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/FR.php
===================================================================
--- trunk/wb/languages/FR.php (revision 768)
+++ trunk/wb/languages/FR.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Encodage';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/ET.php
===================================================================
--- trunk/wb/languages/ET.php (revision 768)
+++ trunk/wb/languages/ET.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset'; //needs to be translated
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/HR.php
===================================================================
--- trunk/wb/languages/HR.php (revision 768)
+++ trunk/wb/languages/HR.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Postavka znakova';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/NL.php
===================================================================
--- trunk/wb/languages/NL.php (revision 768)
+++ trunk/wb/languages/NL.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Tekenset';
$TEXT['MODULE_ORDER'] = 'Module volgorde om te zoeken';
$TEXT['MAX_EXCERPT'] = 'Max lijnen per zoeksessie';
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start datum';
$TEXT['PUBL_END_DATE'] = 'Eind datum';
$TEXT['CALENDAR'] = 'Kalender';
Index: trunk/wb/languages/PL.php
===================================================================
--- trunk/wb/languages/PL.php (revision 768)
+++ trunk/wb/languages/PL.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Kodowanie znaków';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/HU.php
===================================================================
--- trunk/wb/languages/HU.php (revision 768)
+++ trunk/wb/languages/HU.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset'; //needs to be translated
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/IT.php
===================================================================
--- trunk/wb/languages/IT.php (revision 768)
+++ trunk/wb/languages/IT.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Caratteri';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/LV.php
===================================================================
--- trunk/wb/languages/LV.php (revision 768)
+++ trunk/wb/languages/LV.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Simbolu kopa';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/PT.php
===================================================================
--- trunk/wb/languages/PT.php (revision 768)
+++ trunk/wb/languages/PT.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset'; //needs to be translated
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/CA.php
===================================================================
--- trunk/wb/languages/CA.php (revision 768)
+++ trunk/wb/languages/CA.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset'; //needs to be translated
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/DA.php
===================================================================
--- trunk/wb/languages/DA.php (revision 768)
+++ trunk/wb/languages/DA.php (revision 769)
@@ -400,8 +400,9 @@
$TEXT['VERIFICATION'] = 'Indtast verifikationstal';
$TEXT['DEFAULT_CHARSET'] = 'Standard tegnsæt';
$TEXT['CHARSET'] = 'Tegnsæt';
-$TEXT['MODULE_ORDER'] = 'Modul-rækkefølge ved søgning';
-$TEXT['MAX_EXCERPT'] = 'Max linier i uddrag';
+$TEXT['MODULE_ORDER'] = 'Modul-rækkefølge ved søgning';
+$TEXT['MAX_EXCERPT'] = 'Max linier i uddrag';
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Startdato';
$TEXT['PUBL_END_DATE'] = 'Slutdato';
$TEXT['CALENDAR'] = 'Kalender';
Index: trunk/wb/languages/TR.php
===================================================================
--- trunk/wb/languages/TR.php (revision 768)
+++ trunk/wb/languages/TR.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset'; //needs to be translated
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/RU.php
===================================================================
--- trunk/wb/languages/RU.php (revision 768)
+++ trunk/wb/languages/RU.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Charset';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
Index: trunk/wb/languages/DE.php
===================================================================
--- trunk/wb/languages/DE.php (revision 768)
+++ trunk/wb/languages/DE.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Zeichensatz';
$TEXT['MODULE_ORDER'] = 'Modulreihenfolge für die Suche';
$TEXT['MAX_EXCERPT'] = 'Max Anzahl Zitate pro Seite';
+$TEXT['TIME_LIMIT'] = 'Zeitlimit zur Erstellung der Zitate pro Modul';
$TEXT['PUBL_START_DATE'] = 'Start Datum';
$TEXT['PUBL_END_DATE'] = 'End Datum';
$TEXT['CALENDAR'] = 'Kalender';
Index: trunk/wb/languages/BG.php
===================================================================
--- trunk/wb/languages/BG.php (revision 768)
+++ trunk/wb/languages/BG.php (revision 769)
@@ -402,6 +402,7 @@
$TEXT['CHARSET'] = 'Кодова таблица';
$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
+$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
$TEXT['CALENDAR'] = 'Calender'; //needs to be translated
|