gluke Thu Jul 8 01:22:10 2004 EDT
Modified files:
/php-src/ext/mnogosearch php_mnogo.c
Log:
- A bugfix in search words hilightling code (mnogosearch extension).
http://cvs.php.net/diff.php/php-src/ext/mnogosearch/php_mnogo.c?r1=1.89&r2=1.90&ty=u
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.89
php-src/ext/mnogosearch/php_mnogo.c:1.90
--- php-src/ext/mnogosearch/php_mnogo.c:1.89 Tue Jul 6 15:08:44 2004
+++ php-src/ext/mnogosearch/php_mnogo.c Thu Jul 8 01:22:10 2004
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.89 2004/07/06 19:08:44 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.90 2004/07/08 05:22:10 gluke Exp $ */
/*
+----------------------------------------------------------------------+
@@ -2068,7 +2068,7 @@
UdmVarListReplaceStr(&Res->Doc[row].Sections,"URL",al);
free(al);
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"URL",""),1);
+ RETURN_STRING((char
*)UdmVarListFindStr(&(Res->Doc[row].Sections),"URL",""),1);
}
#else
RETURN_STRING((Res->Doc[row].url)?(Res->Doc[row].url):"",1);
@@ -2085,14 +2085,7 @@
case UDM_FIELD_TITLE:
#if UDM_VERSION_ID >= 30204
- {
- char *al;
- al = (char *)MyRemoveHiLightDup((const char
*)(UdmVarListFindStr(&(Res->Doc[row].Sections), "Title", "")));
-
UdmVarListReplaceStr(&Res->Doc[row].Sections,"Title",al);
- free(al);
-
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"Title",""),1);
- }
+ RETURN_STRING((char
*)UdmVarListFindStr(&(Res->Doc[row].Sections),"Title",""),1);
#else
RETURN_STRING((Res->Doc[row].title)?(Res->Doc[row].title):"",1);
#endif
@@ -2100,14 +2093,7 @@
case UDM_FIELD_KEYWORDS:
#if UDM_VERSION_ID >= 30204
- {
- char *al;
- al = (char *)MyRemoveHiLightDup((const char
*)(UdmVarListFindStr(&(Res->Doc[row].Sections), "Meta.Keywords", "")));
-
UdmVarListReplaceStr(&Res->Doc[row].Sections,"Meta.Keywords",al);
- free(al);
-
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"Meta.Keywords",""),1);
- }
+ RETURN_STRING((char
*)UdmVarListFindStr(&(Res->Doc[row].Sections),"Meta.Keywords",""),1);
#else
RETURN_STRING((Res->Doc[row].keywords)?(Res->Doc[row].keywords):"",1);
#endif
@@ -2115,14 +2101,7 @@
case UDM_FIELD_DESC:
#if UDM_VERSION_ID >= 30204
- {
- char *al;
- al = (char *)MyRemoveHiLightDup((const char
*)(UdmVarListFindStr(&(Res->Doc[row].Sections), "Meta.Description", "")));
-
UdmVarListReplaceStr(&Res->Doc[row].Sections,"Meta.Description",al);
- free(al);
-
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"Meta.Description",""),1);
- }
+ RETURN_STRING((char
*)UdmVarListFindStr(&(Res->Doc[row].Sections),"Meta.Description",""),1);
#else
RETURN_STRING((Res->Doc[row].description)?(Res->Doc[row].description):"",1);
#endif
@@ -2130,15 +2109,7 @@
case UDM_FIELD_TEXT:
#if UDM_VERSION_ID >= 30204
-/* {
- char *al;
- al = (char *)MyRemoveHiLightDup((const char
*)(UdmVarListFindStr(&(Res->Doc[row].Sections), "Body", "")));
-
UdmVarListReplaceStr(&Res->Doc[row].Sections,"Body",al);
- free(al);
-
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"Body",""),1);
- }*/
- RETURN_STRING((char
*)UdmVarListFindStr(&Res->Doc[row].Sections,"Body",""),1);
+ RETURN_STRING((char
*)UdmVarListFindStr(&(Res->Doc[row].Sections),"Body",""),1);
#else
RETURN_STRING((Res->Doc[row].text)?(Res->Doc[row].text):"",1);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
