headers
Jens Frank | 1 Jan 2005 12:50
Picon

phase3/includes Block.php,1.22,1.23

Update of /cvsroot/wikipedia/phase3/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17853/includes

Modified Files:
	Block.php 
Log Message:
BUG#1244 Use a UNION to improve index use.

Index: Block.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Block.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Block.php	29 Nov 2004 18:25:04 -0000	1.22
--- Block.php	1 Jan 2005 11:50:19 -0000	1.23
***************
*** 77,81 ****
--- 77,88 ----
  		} elseif ($user=="") {
  			$sql = "SELECT * FROM $ipblocks WHERE ipb_address='" . $db->strencode( $address ) . "' $options";
+ 		} elseif ( $options=='' ) {
+ 			# If there are no optiones (e.g. FOR UPDATE), use a UNION
+ 			# so that the query can make efficient use of indices
+ 			$sql = "SELECT * FROM $ipblocks WHERE ipb_address='" . $db->strencode( $address ) .
+ 				"' UNION SELECT * FROM $ipblocks WHERE ipb_user={$user}";
  		} else {
+ 			# If there are options, a UNION can not be used, use one
+ 			# SELECT instead. Will do a full table scan.
  			$sql = "SELECT * FROM $ipblocks WHERE (ipb_address='" . $db->strencode( $address ) .
(Continue reading)

Permalink | Reply | 0 comments |
headers
zhengzhu | 2 Jan 2005 18:13
Picon

phase3/includes MagicWord.php,1.28.2.1,1.28.2.2

Update of /cvsroot/wikipedia/phase3/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14421/includes

Modified Files:
      Tag: REL1_4
	MagicWord.php 
Log Message:
added magic word __NOCONTENTCONVERT__ to supress conversion of the content of an article. Only used in zh:
for now.

Index: MagicWord.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/MagicWord.php,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -C2 -d -r1.28.2.1 -r1.28.2.2
*** MagicWord.php	29 Dec 2004 02:33:39 -0000	1.28.2.1
--- MagicWord.php	2 Jan 2005 17:13:46 -0000	1.28.2.2
***************
*** 47,50 ****
--- 47,51 ----
  define('MAG_GRAMMAR', 34);
  define('MAG_NOTITLECONVERT', 35);
+ define('MAG_NOCONTENTCONVERT', 36);

  $wgVariableIDs = array(
Permalink | Reply | 0 comments |
headers
zhengzhu | 2 Jan 2005 18:13
Picon

phase3/languages Language.php, 1.390.2.23, 1.390.2.24 LanguageZh.php, 1.46.2.14, 1.46.2.15

Update of /cvsroot/wikipedia/phase3/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14421/languages

Modified Files:
      Tag: REL1_4
	Language.php LanguageZh.php 
Log Message:
added magic word __NOCONTENTCONVERT__ to supress conversion of the content of an article. Only used in zh:
for now.

Index: Language.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/languages/Language.php,v
retrieving revision 1.390.2.23
retrieving revision 1.390.2.24
diff -C2 -d -r1.390.2.23 -r1.390.2.24
*** Language.php	29 Dec 2004 02:33:39 -0000	1.390.2.23
--- Language.php	2 Jan 2005 17:13:47 -0000	1.390.2.24
***************
*** 210,213 ****
--- 210,214 ----
  	MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               ),
  	MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),
+ 	MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'),
  );

Index: LanguageZh.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/languages/LanguageZh.php,v
retrieving revision 1.46.2.14
(Continue reading)

Permalink | Reply | 0 comments |
headers
zhengzhu | 2 Jan 2005 19:00
Picon

phase3 RELEASE-NOTES,1.40.2.76,1.40.2.77

Update of /cvsroot/wikipedia/phase3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24011

Modified Files:
      Tag: REL1_4
	RELEASE-NOTES 
Log Message:
Added magic word MAG_NOCONTENTCONVERT

Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/wikipedia/phase3/RELEASE-NOTES,v
retrieving revision 1.40.2.76
retrieving revision 1.40.2.77
diff -C2 -d -r1.40.2.76 -r1.40.2.77
*** RELEASE-NOTES	31 Dec 2004 15:38:44 -0000	1.40.2.76
--- RELEASE-NOTES	2 Jan 2005 18:00:12 -0000	1.40.2.77
***************
*** 187,190 ****
--- 187,192 ----
  * (bug 1240) Special:Preferences was broken in Slovenian locale when
    $wgUseDynamicDates is enabled
+ * Added magic word MAG_NOCONTENTCONVERT to supress the conversion of the
+   content of an article. Useful in zh:

  === Caveats ===
Permalink | Reply | 0 comments |
headers
Domas Mituzas | 2 Jan 2005 21:28
Picon

extensions/icpagent icpagent.c,1.1.1.1,1.2

Update of /cvsroot/wikipedia/extensions/icpagent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24387

Modified Files:
	icpagent.c 
Log Message:
change default port to a really default 3130

Index: icpagent.c
===================================================================
RCS file: /cvsroot/wikipedia/extensions/icpagent/icpagent.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** icpagent.c	2 Jan 2005 20:07:30 -0000	1.1.1.1
--- icpagent.c	2 Jan 2005 20:28:20 -0000	1.2
***************
*** 211,215 ****
      bzero(&me, sizeof(me));
      me.sin_family = AF_INET;
!     me.sin_port = htons(3100);

      if (bind(s, (struct sockaddr *) &me, sizeof(me)) < 0) {
--- 211,215 ----
      bzero(&me, sizeof(me));
      me.sin_family = AF_INET;
!     me.sin_port = htons(3130);

      if (bind(s, (struct sockaddr *) &me, sizeof(me)) < 0) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
Domas Mituzas | 2 Jan 2005 22:06
Picon

extensions/icpagent metrics_linux.c,1.1.1.1,1.2

Update of /cvsroot/wikipedia/extensions/icpagent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31386

Modified Files:
	metrics_linux.c 
Log Message:
oops, 5% idle cpu is enough for immediate processing, instead of 95% :)

Index: metrics_linux.c
===================================================================
RCS file: /cvsroot/wikipedia/extensions/icpagent/metrics_linux.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** metrics_linux.c	2 Jan 2005 20:07:30 -0000	1.1.1.1
--- metrics_linux.c	2 Jan 2005 21:06:40 -0000	1.2
***************
*** 6,10 ****
  {
      /* Always serve at idle cpu */
!     if (check_idle() < 99)
  	return (0);

--- 6,10 ----
  {
      /* Always serve at idle cpu */
!     if (check_idle() > 5 )
  	return (0);
Permalink | Reply | 0 comments |
headers
Jens Frank | 2 Jan 2005 23:09
Picon

phase3/includes Parser.php,1.366,1.367

Update of /cvsroot/wikipedia/phase3/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13575

Modified Files:
	Parser.php 
Log Message:
BUG#32 External links had a whitespace after the link when tidy was used

Index: Parser.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Parser.php,v
retrieving revision 1.366
retrieving revision 1.367
diff -C2 -d -r1.366 -r1.367
*** Parser.php	23 Dec 2004 14:04:11 -0000	1.366
--- Parser.php	2 Jan 2005 22:09:54 -0000	1.367
***************
*** 1018,1022 ****
  				# Expand the URL for printable version
  				if ( ! $sk->suppressUrlExpansion() ) {
! 					$paren = "<span class='urlexpansion'> (<i>" . htmlspecialchars ( $encUrl ) . "</i>)</span>";
  				} else {
  					$paren = '';
--- 1018,1022 ----
  				# Expand the URL for printable version
  				if ( ! $sk->suppressUrlExpansion() ) {
! 					$paren = "<span class='urlexpansion'>&nbsp;(<i>" . htmlspecialchars ( $encUrl ) . "</i>)</span>";
  				} else {
  					$paren = '';
(Continue reading)

Permalink | Reply | 0 comments |
headers
Jens Frank | 2 Jan 2005 23:14
Picon

phase3/includes Parser.php,1.357.2.6,1.357.2.7

Update of /cvsroot/wikipedia/phase3/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14488

Modified Files:
      Tag: REL1_4
	Parser.php 
Log Message:
BUG#32 External links had a whitespace after the link when tidy was used

Index: Parser.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Parser.php,v
retrieving revision 1.357.2.6
retrieving revision 1.357.2.7
diff -C2 -d -r1.357.2.6 -r1.357.2.7
*** Parser.php	23 Dec 2004 14:02:54 -0000	1.357.2.6
--- Parser.php	2 Jan 2005 22:14:49 -0000	1.357.2.7
***************
*** 1016,1020 ****
  				# Expand the URL for printable version
  				if ( ! $sk->suppressUrlExpansion() ) {
! 					$paren = "<span class='urlexpansion'> (<i>" . htmlspecialchars ( $encUrl ) . "</i>)</span>";
  				} else {
  					$paren = '';
--- 1016,1020 ----
  				# Expand the URL for printable version
  				if ( ! $sk->suppressUrlExpansion() ) {
! 					$paren = "<span class='urlexpansion'>&nbsp;(<i>" . htmlspecialchars ( $encUrl ) . "</i>)</span>";
  				} else {
  					$paren = '';
(Continue reading)

Permalink | Reply | 0 comments |
headers
Magnus Manske | 3 Jan 2005 12:34
Picon

flexbisonparse test.txt, 1.4, 1.5 wikilex.l, 1.14, 1.15 wikiparse.y, 1.17, 1.18

Update of /cvsroot/wikipedia/flexbisonparse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27524

Modified Files:
	test.txt wikilex.l wikiparse.y 
Log Message:
trying external links

Index: wikilex.l
===================================================================
RCS file: /cvsroot/wikipedia/flexbisonparse/wikilex.l,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wikilex.l	29 Dec 2004 10:53:55 -0000	1.14
--- wikilex.l	3 Jan 2005 11:34:17 -0000	1.15
***************
*** 129,133 ****
  <inattributeq>\"" "*    { BEGIN (attributes);     yylval.num = yyleng-1; debuglex2 ("ATTRQ(%d) ",   yyleng-1);
return ATTRQ;   }

! [a-z]             { COMMONTOKENS; debuglex ("LINKTRAIL "); return LINKTRAIL; }
  "\[\[:"             { COMMONTOKENS; debuglex ("OPENLINK "); return OPENLINK; }
  "\[\["              { COMMONTOKENS; debuglex ("OPENDBLSQBR "); return OPENDBLSQBR; }
--- 129,138 ----
  <inattributeq>\"" "*    { BEGIN (attributes);     yylval.num = yyleng-1; debuglex2 ("ATTRQ(%d) ",   yyleng-1);
return ATTRQ;   }

! http                { COMMONTOKENS; debuglex ("PROTOCOL "); return PROTOCOL ; }
! \:\/\/                { COMMONTOKENS; debuglex ("PROTOCOLSEP "); return PROTOCOLSEP ; }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Domas Mituzas | 3 Jan 2005 12:54
Picon

extensions/icpagent icpagent.c,1.2,1.3

Update of /cvsroot/wikipedia/extensions/icpagent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30900

Modified Files:
	icpagent.c 
Log Message:
reinit wait timeouts on every select.

Index: icpagent.c
===================================================================
RCS file: /cvsroot/wikipedia/extensions/icpagent/icpagent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** icpagent.c	2 Jan 2005 20:28:20 -0000	1.2
--- icpagent.c	3 Jan 2005 11:53:57 -0000	1.3
***************
*** 202,207 ****
      fd_set readfds;

-     wait.tv_sec = 0;
-     wait.tv_usec = 1000;

  
--- 202,205 ----
***************
*** 223,226 ****
--- 221,226 ----
  	FD_ZERO(&readfds);
  	FD_SET(s,&readfds);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane