Change expensive uses of split to the much faster explode.

darcs-hash:20090528215438-6942e-bf1b875e689ade6bd1a17e3d812ce16bf35c84a6.gz

3 files changed, 9 insertions, 7 deletions

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 5bcb3c2f0..83f837b70 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -363,7 +363,7 @@ class Doku_Handler {
     function code($match, $state, $pos) {
         switch ( $state ) {
             case DOKU_LEXER_UNMATCHED:
-                $matches = preg_split('/>/u',$match,2);
+                $matches = explode('>',$match,2);
                 $matches[0] = trim($matches[0]);
                 if ( trim($matches[0]) == '' ) {
                     $matches[0] = NULL;
@@ -444,7 +444,7 @@ class Doku_Handler {
         $link = preg_replace(array('/^\[\[/','/\]\]$/u'),'',$match);
 
         // Split title from URL
-        $link = preg_split('/\|/u',$link,2);
+        $link = explode('|',$link,2);
         if ( !isset($link[1]) ) {
             $link[1] = NULL;
         } else if ( preg_match('/^\{\{[^\}]+\}\}$/',$link[1]) ) {
@@ -457,7 +457,7 @@ class Doku_Handler {
 
         if ( preg_match('/^[a-zA-Z0-9\.]+>{1}.*$/u',$link[0]) ) {
         // Interwiki
-            $interwiki = preg_split('/>/u',$link[0]);
+            $interwiki = explode('>',$link[0],2);
             $this->_addCall(
                 'interwikilink',
                 array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]),
@@ -638,7 +638,7 @@ function Doku_Handler_Parse_Media($match) {
     $link = preg_replace(array('/^\{\{/','/\}\}$/u'),'',$match);
 
     // Split title from URL
-    $link = preg_split('/\|/u',$link,2);
+    $link = explode('|',$link,2);
 
 
     // Check alignment
@@ -997,7 +997,9 @@ class Doku_Handler_List {
         } else {
             $type = 'o';
         }
-        return count(explode('  ',str_replace("\t",'  ',$match)));
+        // Is the +1 needed? It used to be count(explode(...))
+        // but I don't think the number is seen outside this handler
+        return substr_count(str_replace("\t",'  ',$match), '  ') + 1;
     }
 }
 
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 86e818d9c..d2aaf407b 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -513,7 +513,7 @@ class Doku_Lexer {
         // modes starting with plugin_ are all handled by the same
         // handler but with an additional parameter
         if(substr($handler,0,7)=='plugin_'){
-          list($handler,$plugin) = split('_',$handler,2);
+          list($handler,$plugin) = explode('_',$handler,2);
               return $this->_parser->$handler($content, $is_match, $pos, $plugin);
         }
 
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 79d774106..88d531af1 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -315,7 +315,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
 
     // first resolve and clean up the $id
     resolve_pageid(getNS($ID), $id, $exists);
-    list($page, $hash) = split('#', $id, 2);
+    list($page, $hash) = explode('#', $id, 2);
 
     // set metadata
     $this->meta['relation']['references'][$page] = $exists;