[adminer-svn] SF.net SVN: adminer:[998] trunk/adminer/sql.inc.php

[<jak...@us...>]

Revision: 998
          http://adminer.svn.sourceforge.net/adminer/?rev=998&view=rev
Author:   jakubvrana
Date:     2009-08-22 13:44:05 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Optimize $offset

Modified Paths:
--------------
    trunk/adminer/sql.inc.php

Modified: trunk/adminer/sql.inc.php
===================================================================
--- trunk/adminer/sql.inc.php	2009-08-22 13:08:26 UTC (rev 997)
+++ trunk/adminer/sql.inc.php	2009-08-22 13:44:05 UTC (rev 998)
@@ -34,10 +34,11 @@
 				$offset = $match[0][1] + strlen($found);
 				if ($found && $found != $delimiter) {
 					// is not end of a query - find closing part
-					if (ereg('-- |#', $found)) {
-						$offset = strpos($query, "\n", $offset);
-					} elseif ($found == "/*") {
-						$offset = strpos($query, "*/", $offset);
+					if (ereg('/\\*|-- |#', $found)) {
+						$offset = strpos($query, ($found == "/*" ? "*/" : "\n"), $offset);
+						if (!$offset) {
+							$offset = strlen($query);
+						}
 					} else {
 						// find matching quote
 						while (preg_match("~$found|\\\\.|\$~s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
@@ -48,9 +49,6 @@
 							}
 						}
 					}
-					if (!$offset) {
-						$offset = strlen($query);
-					}
 				} else {
 					$empty = false;
 					echo "<pre class='jush-sql'>" . shorten_utf8(trim(substr($query, 0, $match[0][1]))) . "</pre>\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.