From nobody Sun Feb 8 12:43:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554330435316333.92373799104325; Wed, 3 Apr 2019 15:27:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1E343082B5A; Wed, 3 Apr 2019 22:27:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB7DB61082; Wed, 3 Apr 2019 22:27:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8C89E38BE; Wed, 3 Apr 2019 22:27:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33MR0Jx020298 for ; Wed, 3 Apr 2019 18:27:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 310AA10A33C5; Wed, 3 Apr 2019 22:27:00 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id C155F10A33C1; Wed, 3 Apr 2019 22:26:59 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 18:26:51 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] docs: Remove search.php and all references X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 03 Apr 2019 22:27:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" libvirt.org/search.php drops into some kind of screen which I guess is supposed to show a search bar with options, but presently for me renders as nothing but the following text: Search the documentation on Libvirt.org The search service indexes the libvirt APIs and documentation as well as th= e libvir-list@redhat.com mailing-list archives. To use it simply provide a = set of keywords: The main page search bar now redirects to google, this page is broken, I say we just remove it and move on. Signed-off-by: Cole Robinson Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitignore | 1 - docs/Makefile.am | 22 +--- docs/devhelp/html.xsl | 4 - docs/search.php.code.in | 225 ---------------------------------------- docs/search.php.in | 16 --- 5 files changed, 2 insertions(+), 266 deletions(-) delete mode 100644 docs/search.php.code.in delete mode 100644 docs/search.php.in diff --git a/.gitignore b/.gitignore index c918ec8226..7f99e5db2d 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,6 @@ /docs/libvirt-qemu-*.xml /docs/libvirt-refs.xml /docs/news.html.in -/docs/search.php /docs/todo.html.in /examples/admin/client_close /examples/admin/client_info diff --git a/docs/Makefile.am b/docs/Makefile.am index bd7bc1a431..ebdc734ddd 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -128,10 +128,6 @@ dot_html_in =3D \ $(notdir $(wildcard $(srcdir)/*.html.in)) dot_html =3D $(dot_html_in:%.html.in=3D%.html) =20 -dot_php_in =3D $(notdir $(wildcard $(srcdir)/*.php.in)) -dot_php_code_in =3D $(dot_php_in:%.php.in=3D%.php.code.in) -dot_php =3D $(dot_php_in:%.php.in=3D%.php) - xml =3D \ libvirt-api.xml \ libvirt-refs.xml @@ -175,7 +171,7 @@ EXTRA_DIST=3D \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ - $(logofiles) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ + $(logofiles) \ $(internals_html_in) $(internals_html) $(fonts) \ aclperms.htmlinc \ hvsupport.pl \ @@ -192,7 +188,6 @@ MAINTAINERCLEANFILES =3D \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ - $(addprefix $(srcdir)/,$(dot_php)) \ $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc =20 timestamp=3D"$(shell if test -n "$$SOURCE_DATE_EPOCH"; \ @@ -209,8 +204,7 @@ qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libv= irt-qemu-refs.xml lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml =20 -web: $(dot_html) $(internals_html) html/index.html devhelp/index.html \ - $(dot_php) +web: $(dot_html) $(internals_html) html/index.html devhelp/index.html =20 hvsupport.html: $(srcdir)/hvsupport.html.in =20 @@ -265,18 +259,6 @@ MAINTAINERCLEANFILES +=3D \ $(AM_V_GEN)$(XMLLINT) --nonet --format $< > $(srcdir)/$@ \ || { rm $(srcdir)/$@ && exit 1; } =20 -%.php.tmp: %.php.in site.xsl page.xsl - $(AM_V_GEN)$(XSLTPROC) --stringparam pagename $(@:.tmp=3D) \ - --stringparam timestamp $(timestamp) --nonet \ - $(top_srcdir)/docs/site.xsl $< > $@ \ - || { rm $@ && exit 1; } - -%.php: %.php.tmp %.php.code.in - $(AM_V_GEN)sed \ - -e '/<\/span>/r '"$(srcdir)/$@.code.in" \ - -e /php_placeholder/d < $@.tmp > $(srcdir)/$@ \ - || { rm $(srcdir)/$@ && exit 1; } - $(apihtml_generated): html/index.html =20 html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) diff --git a/docs/devhelp/html.xsl b/docs/devhelp/html.xsl index eb10e362bf..9cdc049150 100644 --- a/docs/devhelp/html.xsl +++ b/docs/devhelp/html.xsl @@ -565,10 +565,6 @@ by a Linux instance. The library aim at providing long= term stable C API initially for the Xen paravirtualization but should be able to integrate other virtualization mechanisms if needed.

-

If you get lost searching for some specific API use, try -the online search -engine hosted on libvirt.org -it indexes the project page, the APIs as well as the mailing-list archives= .

diff --git a/docs/search.php.code.in b/docs/search.php.code.in deleted file mode 100644 index 01a6a64d28..0000000000 --- a/docs/search.php.code.in +++ /dev/null @@ -1,225 +0,0 @@ - - -
" - enctype=3D"application/x-www-form-urlencoded" method=3D"get"> - "/> - - -
- - $rb) ? -1 : 1; - } - if (($query) && (strlen($query) <=3D 50)) { - $link =3D mysql_connect ("localhost", "nobody"); - if (!$link) { - echo "

Could not connect to the database: ", mysql_error(); - } else { - mysql_select_db("libvir", $link); - $list =3D explode (" ", $query); - $results =3D array(); - $number =3D 0; - for ($number =3D 0;$number < count($list);$number++) { - - $word =3D $list[$number]; - if (($scope =3D=3D 'any') || ($scope =3D=3D 'API')) { - list($result, $j) =3D queryWord($word); - if ($j > 0) { - for ($i =3D 0; $i < $j; $i++) { - $relevance =3D mysql_result($result, $i, 0); - $name =3D mysql_result($result, $i, 1); - $type =3D mysql_result($result, $i, 2); - $module =3D mysql_result($result, $i, 3); - $desc =3D mysql_result($result, $i, 4); - if (array_key_exists($name, $results)) { - list($r,$t,$m,$d,$w,$u) =3D $results[$name= ]; - $results[$name] =3D array(($r + $relevance= ) * 2, - $t,$m,$d,$w,$u); - } else { - $id =3D $name; - $m =3D strtolower($module); - $url =3D "html/libvirt-$module.html#$id"; - $results[$name] =3D array($relevance,$type, - $module, $desc, $name, $ur= l); - } - } - mysql_free_result($result); - } - } - if (($scope =3D=3D 'any') || ($scope =3D=3D 'DOCS')) { - list($result, $k) =3D queryHTMLWord($word); - if ($k > 0) { - for ($i =3D 0; $i < $k; $i++) { - $relevance =3D mysql_result($result, $i, 0); - $name =3D mysql_result($result, $i, 1); - $id =3D mysql_result($result, $i, 2); - $module =3D mysql_result($result, $i, 3); - $desc =3D mysql_result($result, $i, 4); - $url =3D $module; - if ($id !=3D "") { - $url =3D $url + "#$id"; - } - $results["$name _html_ $number _ $i"] =3D - array($relevance, "XML docs", - $module, $desc, $name, $ur= l); - } - mysql_free_result($result); - } - } - if (($scope =3D=3D 'any') || ($scope =3D=3D 'LISTS')) { - list($result, $j) =3D queryArchiveWord($word); - if ($j > 0) { - for ($i =3D 0; $i < $j; $i++) { - $relevance =3D mysql_result($result, $i, 0); - $name =3D mysql_result($result, $i, 1); - $type =3D mysql_result($result, $i, 2); - $url =3D mysql_result($result, $i, 3); - $desc =3D mysql_result($result, $i, 4); - if (array_key_exists($url, $results)) { - list($r,$t,$m,$d,$w,$u) =3D $results[$url]; - $results[$name] =3D array(($r + $relevance= ) * 2, - $t,$m,$d,$w,$u); - } else { - $id =3D $name; - $m =3D strtolower($module); - $u =3D str_replace( - "http://www.redhat.com/archives/libvir-list/", "",= $url); - $results[$url] =3D array($relevance,$type, - $u, $desc, $name, $url); - } - } - mysql_free_result($result); - } - } - } - if ((count($results) =3D=3D 0) && (count($list) =3D=3D 1)) { - $word =3D $list[0]; - if (($scope =3D=3D 'any') || ($scope =3D=3D 'XMLAPI')) { - list($result, $j) =3D queryWord("vir$word"); - if ($j > 0) { - for ($i =3D 0; $i < $j; $i++) { - $relevance =3D mysql_result($result, $i, 0); - $name =3D mysql_result($result, $i, 1); - $type =3D mysql_result($result, $i, 2); - $module =3D mysql_result($result, $i, 3); - $desc =3D mysql_result($result, $i, 4); - if (array_key_exists($name, $results)) { - list($r,$t,$m,$d,$w,$u) =3D $results[$name= ]; - $results[$name] =3D array(($r + $relevance= ) * 2, - $t,$m,$d,$w,$u); - } else { - $id =3D $name; - $m =3D strtolower($module); - $url =3D "html/libvirt-$module.html#$id"; - $results[$name] =3D array($relevance,$type, - $module, $desc, $name, $ur= l); - } - } - mysql_free_result($result); - } - } - } - mysql_close($link); - $nb =3D count($results); - echo "

Found $nb results for query $querys= tr

\n"; - usort($results, "resSort"); - - if ($nb > 0) { - printf("\n"); - printf("module\n"); - $i =3D 0; - while (list ($name, $val) =3D each ($results)) { - list($r,$t,$m,$d,$s,$u) =3D $val; - $m =3D str_replace("<", "<", $m); - $s =3D str_replace("<", "<", $s); - $d =3D str_replace("<", "<", $d); - echo "$t"; - $i =3D $i + 1; - if ($i > 75) - break; - } - printf("
QualitySymbolTypeDescription
$r$s$m$d
\n"); - } - } - } -?> diff --git a/docs/search.php.in b/docs/search.php.in deleted file mode 100644 index 5de4fcee66..0000000000 --- a/docs/search.php.in +++ /dev/null @@ -1,16 +0,0 @@ - - - - -

Search the documentation on Libvirt.org

- -

- The search service indexes the libvirt APIs and documentation as - well as the libvir-list@redhat.com mailing-list archives. To use - it simply provide a set of keywords: -

- - - - - --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list