Index: openacs-4/packages/acs-admin/acs-admin.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v diff -u -N -r1.32 -r1.33 --- openacs-4/packages/acs-admin/acs-admin.info 5 Jun 2006 00:02:35 -0000 1.32 +++ openacs-4/packages/acs-admin/acs-admin.info 15 Dec 2006 00:00:50 -0000 1.33 @@ -7,20 +7,20 @@ t t - + Don Baccus An interface for Site-wide administration of an OpenACS Installation. 3 - 2006-06-04 + 2006-11-19 OpenACS GPL 3 Provides a UI for administering site-wide services (including package installation, cache, authentication, and user accounts) for an OpenACS system. - - + + Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/merge-final.tcl 4 Jun 2006 00:45:20 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/merge-final.tcl 15 Dec 2006 00:00:54 -0000 1.3 @@ -32,7 +32,7 @@ if { !$merge_p } { ad_returnredirect "/acs-admin/users" } else { - set final_results [callback MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id] + set final_results [callback merge::MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id] set results "
    " foreach item $final_results { Index: openacs-4/packages/acs-admin/www/users/merge.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-admin/www/users/merge.tcl 4 Jun 2006 00:45:20 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/merge.tcl 15 Dec 2006 00:00:54 -0000 1.3 @@ -38,7 +38,7 @@ set one_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]" } -set user_id_one_items [callback MergeShowUserInfo -user_id $user_id ] +set user_id_one_items [callback merge::MergeShowUserInfo -user_id $user_id ] if { ![empty_string_p $user_id_one_items] } { set user_id_one_items_html "
    • Packages User Information
        " foreach pkg_list $user_id_one_items { @@ -69,7 +69,7 @@ set two_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]" } -set user_id_two_items [callback MergeShowUserInfo -user_id $user_id_from_search ] +set user_id_two_items [callback merge::MergeShowUserInfo -user_id $user_id_from_search ] if { ![empty_string_p $user_id_two_items] } { set user_id_two_items_html "
        • Packages User Information
            " foreach pkg_list $user_id_two_items { Index: openacs-4/packages/acs-api-browser/acs-api-browser.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/acs-api-browser.info,v diff -u -N -r1.21 -r1.22 --- openacs-4/packages/acs-api-browser/acs-api-browser.info 5 Jun 2006 00:02:35 -0000 1.21 +++ openacs-4/packages/acs-api-browser/acs-api-browser.info 15 Dec 2006 00:00:56 -0000 1.22 @@ -7,18 +7,18 @@ t t - + OpenACS Interactive documentation for the Tcl and SQL APIs. - 2006-06-04 + 2006-11-19 3 OpenACS GPL 3 On line interactive documentation for the locally installed Tcl and SQL APIs. Links to the Tcl core and AOLServer online documentation as well. - - + + Index: openacs-4/packages/acs-authentication/acs-authentication.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/acs-authentication.info,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/acs-authentication/acs-authentication.info 5 Jun 2006 00:02:35 -0000 1.23 +++ openacs-4/packages/acs-authentication/acs-authentication.info 15 Dec 2006 00:00:59 -0000 1.24 @@ -7,19 +7,19 @@ t t - + Lars Pind Authentication, account management, and related functionality. - 2006-06-04 + 2006-11-19 3 Collaboraid 3 GPL version 2 Implements authentication-related security functions for OpenACS, including password, account and session management, bulk account creation etc. Provides a contract based interface for different authentication methods such as PAM or LDAP based authentication. - - - + + + Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.cs_CZ.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.cs_CZ.utf-8.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-authentication/catalog/acs-authentication.cs_CZ.utf-8.xml 15 Dec 2006 00:01:02 -0000 1.2 @@ -0,0 +1,5 @@ + + + + Neplatné uživatelské jméno nebo heslo + Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.gl_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.gl_ES.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-authentication/catalog/acs-authentication.gl_ES.ISO-8859-1.xml 15 Dec 2006 00:01:02 -0000 1.2 @@ -0,0 +1,5 @@ + + + + Usuario ou contrasinal err�neo + Index: openacs-4/packages/acs-authentication/catalog/acs-authentication.nl_ZA.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/catalog/acs-authentication.nl_ZA.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-authentication/catalog/acs-authentication.nl_ZA.ISO-8859-1.xml 15 Dec 2006 00:01:02 -0000 1.2 @@ -0,0 +1,5 @@ + + + + Ongeldige gebruikersnaam of wagwoord + Index: openacs-4/packages/acs-automated-testing/acs-automated-testing.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/acs-automated-testing.info,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/acs-automated-testing/acs-automated-testing.info 5 Jun 2006 00:02:36 -0000 1.20 +++ openacs-4/packages/acs-automated-testing/acs-automated-testing.info 15 Dec 2006 00:01:04 -0000 1.21 @@ -7,10 +7,10 @@ t t - + OpenACS The interface to the automated testing facilities within OpenACS. - 2006-06-04 + 2006-11-19 3 OpenACS 3 @@ -20,8 +20,8 @@ OpenACS system. Also provides a UI for managing automatic-rebuild servers as in a test farm. - - + + Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v diff -u -N -r1.24 -r1.25 --- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 5 Jun 2006 00:02:36 -0000 1.24 +++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 15 Dec 2006 00:01:06 -0000 1.25 @@ -7,18 +7,18 @@ t t - + Don Baccus Bootstraps an OpenACS installation. - 2006-06-04 + 2006-11-19 3 OpenACS GPL 3 This package bootstraps OpenACS. If the core packages have not yet been installed, it calls the installer which leads the user through the steps necessary to do so. It also checks that the installation meets the requirements for a successful install of OpenACS. - - + + Index: openacs-4/packages/acs-content-repository/acs-content-repository.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v diff -u -N -r1.65 -r1.66 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 20 Nov 2006 09:24:58 -0000 1.65 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 15 Dec 2006 00:01:08 -0000 1.66 @@ -6,11 +6,12 @@ Content Repository Services t t - - + + OpenACS The canonical repository for OpenACS content. - 2006-06-04 + 2006-11-19 + 3 OpenACS Provides the API for creating and managing user generated content including full support for versioning, rendering content to the filesystem, folders and composite content items, and @@ -19,10 +20,10 @@ GPL 3 - - - - + + + + Index: openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.0-5.1.1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/upgrade/Attic/upgrade-5.1.0-5.1.1.sql,v diff -u -N --- openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.0-5.1.1.sql 17 May 2004 15:14:44 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ --- - --- @author Dave Bauer (dave@thedesignexperience.org) --- @creation-date 2004-05-02 --- @cvs-id $Id: upgrade-5.1.0-5.1.1.sql,v 1.2 2004/05/17 15:14:44 jeffd Exp $ --- - --- reload packages to get fixed version of content_folder.rename - -@@ ../packages-create.sql Index: openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5d2-5.1.5d3.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5d2-5.1.5d3.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5d2-5.1.5d3.sql 24 Feb 2005 13:32:58 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5d2-5.1.5d3.sql 15 Dec 2006 00:01:09 -0000 1.3 @@ -3094,3 +3094,13 @@ end content_folder; / show errors +-- + +-- @author Dave Bauer (dave@thedesignexperience.org) +-- @creation-date 2004-05-02 +-- @cvs-id $Id$ +-- + +-- reload packages to get fixed version of content_folder.rename + +@@ ../packages-create.sql Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d18-5.2.0d19.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d18-5.2.0d19.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d18-5.2.0d19.sql 13 Jul 2006 20:43:13 -0000 1.1 +++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.2.0d18-5.2.0d19.sql 15 Dec 2006 00:01:12 -0000 1.2 @@ -50,3 +50,53 @@ end;' language 'plpgsql'; +-- +-- +-- +-- @author Dave Bauer (dave@thedesignexperience.org) +-- @creation-date 2005-06-05 +-- @arch-tag: 16725764-0b5d-4e98-a75d-dc77bf3141de +-- @cvs-id $Id$ +-- + +-- patch#548 bug#1937 + +select define_function_args('content_revision__copy_attributes','content_type,revision_id,copy_id'); +create or replace function content_revision__copy_attributes (varchar,integer,integer) +returns integer as ' +declare + copy_attributes__content_type alias for $1; + copy_attributes__revision_id alias for $2; + copy_attributes__copy_id alias for $3; + v_table_name acs_object_types.table_name%TYPE; + v_id_column acs_object_types.id_column%TYPE; + cols varchar default ''''; + attr_rec record; +begin + + if copy_attributes__content_type is null or copy_attributes__revision_id is null or copy_attributes__copy_id is null then + raise exception ''content_revision__copy_attributes called with null % % %'',copy_attributes__content_type,copy_attributes__revision_id, copy_attributes__copy_id; + end if; + + select table_name, id_column into v_table_name, v_id_column + from acs_object_types where object_type = copy_attributes__content_type; + + for attr_rec in select + attribute_name + from + acs_attributes + where + object_type = copy_attributes__content_type + LOOP + cols := cols || '', '' || attr_rec.attribute_name; + end loop; + + execute ''insert into '' || v_table_name || ''('' || v_id_column || cols || '')'' || '' select '' || copy_attributes__copy_id || + '' as '' || v_id_column || cols || '' from '' || + v_table_name || '' where '' || v_id_column || '' = '' || + copy_attributes__revision_id; + + return 0; + +end;' language 'plpgsql'; + Index: openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl,v diff -u -N -r1.17 -r1.18 --- openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 31 Aug 2006 14:08:30 -0000 1.17 +++ openacs-4/packages/acs-content-repository/tcl/content-revision-procs.tcl 15 Dec 2006 00:01:15 -0000 1.18 @@ -71,6 +71,8 @@ @param package_id + @param package_id + @param is_live @param attributes A list of lists of pairs of additional attributes and Index: openacs-4/packages/acs-core-docs/acs-core-docs.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/acs-core-docs.info,v diff -u -N -r1.21 -r1.22 --- openacs-4/packages/acs-core-docs/acs-core-docs.info 5 Jun 2006 00:02:36 -0000 1.21 +++ openacs-4/packages/acs-core-docs/acs-core-docs.info 15 Dec 2006 00:01:18 -0000 1.22 @@ -7,19 +7,19 @@ t t - + OpenACS Documentation Team Documentation for the OpenACS Core. - 2006-06-04 + 2006-11-19 OpenACS GPL 3 Static HTML documentation for the OpenACS core (includes the DocBook sources). - - - + + + Index: openacs-4/packages/acs-core-docs/www/xml/variables.ent =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/variables.ent,v diff -u -N -r1.14 -r1.15 --- openacs-4/packages/acs-core-docs/www/xml/variables.ent 17 Jul 2006 05:38:37 -0000 1.14 +++ openacs-4/packages/acs-core-docs/www/xml/variables.ent 15 Dec 2006 00:01:20 -0000 1.15 @@ -1,7 +1,7 @@ - - - + + + - - + + Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v diff -u -N -r1.21 -r1.22 --- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 17 Jul 2006 05:38:37 -0000 1.21 +++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 15 Dec 2006 00:01:22 -0000 1.22 @@ -48,6 +48,17 @@ + + Release 5.2.0 + + + Bug fixes. + New TIPs implemented. + This release does not include new translations. + + + + Release 5.1.4 @@ -393,6 +404,7 @@ ChangeLog missing +--> + - + @elements.section@ - - + -
            +
            -
            -
            +
            +
            @@ -36,7 +36,9 @@ + + * @@ -64,31 +66,30 @@ + + - + -
            - +
            \@formerror.@elements.id@;noquote\@ -             - + -

            -

            - + +             Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -N -r1.40 -r1.41 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 11 Nov 2006 20:16:48 -0000 1.40 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 15 Dec 2006 00:02:09 -0000 1.41 @@ -33,7 +33,7 @@ {-has_checkboxes:boolean} {-checkbox_name "checkbox"} {-orderby_name "orderby"} - {-row_pretty_plural "data"} + {-row_pretty_plural "#acs-templating.data#"} {-no_data ""} {-main_class "list"} {-sub_class ""} @@ -287,6 +287,7 @@ } # Set default for no_data + set row_pretty_plural [lang::util::localize $row_pretty_plural] set no_data [ad_decode $no_data "" [_ acs-templating.No_row_pretty_plural] $no_data] # Set ulevel to the level of the page, so we can access it later set list_properties(ulevel) "\#[expr [info level] - $ulevel]" @@ -338,8 +339,8 @@ -list_name $name \ -element_name $checkbox_name \ -spec { - label {} - display_template {} + label {} + display_template {} sub_class {narrow} html { align center } } @@ -430,20 +431,20 @@ template::list::filter::create \ -list_name $name \ -filter_name "page_size" \ - -spec [list label "Page Size" default_value 20 hide_p t] + -spec [list label "[_ acs-templating.Page_Size]" default_value 20 hide_p t] } if { (![empty_string_p $list_properties(page_size)] && $list_properties(page_size) != 0) || $list_properties(page_size_variable_p) == 1 } { # Check that we have either page_query or page_query_name if { [empty_string_p $list_properties(page_query)] && [empty_string_p $list_properties(page_query_name)] } { - error "When specifying a non-zero page_size, you must also provide either page_query or page_query_name" + error "[_ acs-templating.lt_When_specifying_a_non]" } # We create the selected page as a filter, so we get the filter,page thing out template::list::filter::create \ -list_name $name \ -filter_name "page" \ - -spec [list label "Page" default_value 1 hide_p t] + -spec [list label "[_ acs-templating.Page]" default_value 1 hide_p t] } # generate filter form @@ -764,7 +765,7 @@ append __output "\"[join $__cols "\",\""]\"\n" } - ns_return 200 text/plain $__output + ns_return 200 text/csv $__output } @@ -1372,7 +1373,6 @@ if { [empty_string_p [string trim $label]] } { set label $filter_properties(null_label) } - switch $filter_properties(type) { singleval { set selected_p [exists_and_equal current_filter_value $value] @@ -1381,12 +1381,22 @@ if { ![exists_and_not_null current_filter_value] } { set selected_p 0 } else { - set selected_p [util_sets_equal_p $current_filter_value $value] + # Since here we have multiple values + # we set as selected_p the value that match any + # of the values present in the list + set selected_p 0 + foreach val $current_filter_value { + if { [util_sets_equal_p $val $value] } { + set selected_p 1 + break + } + } } } multivar { # Value is a list of { key value } lists # We only check the value whose key matches the filter name + set selected_p 0 foreach elm $value { foreach { elm_key elm_value } [lrange $elm 0 1] {} if { [string equal $elm_key $filter_properties(name)] } { @@ -1478,6 +1488,7 @@ # Loop over 'values' and 'url' simultaneously foreach elm $filter_properties(values) url $filter_properties(urls) selected_p $filter_properties(selected_p) add_url $filter_properties(add_urls) { + # 'label' is the first element, 'value' the second # We do an lrange here, otherwise values would be set wrong # in case someone accidentally supplies a list with too many elements, @@ -1488,17 +1499,25 @@ set label $filter_properties(null_label) } - template::multirow -local append filters \ - $filter_properties(name) \ - $filter_properties(label) \ - $filter_properties(clear_url) \ - [string_truncate -len 25 -- $label] \ - $value \ - $url \ - $label \ - $count \ - $add_url \ - $selected_p + if { [string equal $filter_properties(type) "multival"] } { + # We need to ns_urlencode the name to work + set filter_properties_name [ns_urlencode $filter_properties(name)] + } else { + set filter_properties_name $filter_properties(name) + } + + template::multirow -local append filters \ + $filter_properties_name \ + $filter_properties(label) \ + $filter_properties(clear_url) \ + [string_truncate -len 25 -- $label] \ + $value \ + $url \ + $label \ + $count \ + $add_url \ + $selected_p \ + $filter_properties(type) } } } Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/de.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/de.js,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/de.js 15 Dec 2006 00:02:11 -0000 1.2 @@ -0,0 +1,4 @@ +// empty +{ +}; + Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/en.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/en.js,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/OacsFs/lang/en.js 15 Dec 2006 00:02:11 -0000 1.2 @@ -0,0 +1,2 @@ +// empty +{}; Index: openacs-4/packages/acs-translations/acs-translations.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-translations/acs-translations.info,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-translations/acs-translations.info 5 Jun 2006 00:02:39 -0000 1.3 +++ openacs-4/packages/acs-translations/acs-translations.info 15 Dec 2006 00:02:12 -0000 1.4 @@ -7,13 +7,13 @@ t t - + Malte Sussdorff Package for storing dynamic translations Package for storing dynamic translations 3 - + Index: openacs-4/packages/ref-timezones/ref-timezones.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ref-timezones/ref-timezones.info,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/ref-timezones/ref-timezones.info 5 Jun 2006 00:02:40 -0000 1.22 +++ openacs-4/packages/ref-timezones/ref-timezones.info 15 Dec 2006 00:02:13 -0000 1.23 @@ -7,17 +7,17 @@ t t - + Jon Griffin Timezone data for acs-reference. - 2006-06-04 + 2006-11-19 3 Mayuli Enterprises, LLC This is the timezone data for the acs-reference data package. Used by acs-lang (among others) for localized times. - - - + + + Index: openacs-4/packages/search/search.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v diff -u -N -r1.25 -r1.26 --- openacs-4/packages/search/search.info 5 Jun 2006 00:02:40 -0000 1.25 +++ openacs-4/packages/search/search.info 15 Dec 2006 00:02:15 -0000 1.26 @@ -7,9 +7,9 @@ t f - + OpenACS - 2006-06-04 + 2006-11-19 3 Site wide search OpenACS @@ -18,7 +18,7 @@ Site wide search implemented with service contracts, currently only supports postgres via the OpenFTS driver. - + Index: openacs-4/packages/search/catalog/search.cs_CZ.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.cs_CZ.utf-8.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/search/catalog/search.cs_CZ.utf-8.xml 15 Dec 2006 00:02:16 -0000 1.2 @@ -0,0 +1,30 @@ + + + + Pokročilé hledání + kdykoli + Datové rozmezí + podrobnosti + Zkusím štěstí + "<b>%stopwords%</b>" je velmi běžné slovo a nebylo zahrnuto do vašeho hledání + FtsEngineDriver není dostupný! + Ověřte korektní zápis všech slov + Nebyly nalezené žádné stránky obsahující " + Následující slova jsou velmi běžná a nebyla zahrnuta do vašeho hledání + Zkuste jiná klíčová slova. + Zkuste obecnější klíčová slova. + Zkuste hledat na: %stw;noquote% + Musíte zadat klíčová slova + Další + poslední 3 měsíce + posledních 6 měsíců + poslední rok + Předchozí + Strana s výsledky: + výsledky + Hledat + Hledaný výraz: %query% + Návrhy: + Zkuste méně klíčových slov. + Nepojmenováno + Index: openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml 5 Nov 2006 12:38:02 -0000 1.3 +++ openacs-4/packages/search/catalog/search.de_DE.ISO-8859-1.xml 15 Dec 2006 00:02:16 -0000 1.4 @@ -1,9 +1,5 @@ -<<<<<<< search.de_DE.ISO-8859-1.xml - -======= - ->>>>>>> 1.1.2.2 + Erweiterte Suche Der '<b>AND</>' operator is unn�tig -- es sind alle Suchbegriffe standardm�ssig enthalten Index: openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml 5 Jun 2006 00:02:40 -0000 1.3 +++ openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml 15 Dec 2006 00:02:16 -0000 1.4 @@ -2,27 +2,34 @@ B�squeda Avanzada + El operador "<b>AND</b>" no es necesario, por defecto se toman en cuenta todos los t�rminos para realizar la b�squeda. cualquier hora Rango de Fechas detalles + Mostrar Me siento afortunado "<b>%stopwords%</b>" es una palabra muy com�n y no ha sido tomada en cuenta para la b�squeda. �FtsEngineDriver no disponible! Aseg�rese que todas las palabras est�n escritas correctamente. + No se encontraron p�ginas que contengan "<b>%query%</b>". + Las siguientes palabras son muy comunes y no han sido incluidas en la b�squeda: <strong>%stopwords;noquote%</strong>. Int�ntelo con otras palabras. Int�ntelo con palabras m�s gen�ricas. Intente realizar la b�squeda sobre %stw;noquote% Debe especificar algunas palabras. Siguiente + Buscar no est� habilitado. Por favor, contacte el webmaster para que lo active. �ltimos 3 meses �ltimos 6 meses a�o anterior Anterior P�gina de resultados: resultados + <b>%low% - %high%</b> resultados de <b>%count%</b>. La b�squeda se realiz� en %elapsed% segundos. Buscar B�squedas para: <b>%query%</b> Sugerencias: + Nota: En la mayor�a de los navegadores, puede pulsar simplemente el "intro" en lugar de hacer click sobre el bot�n de b�squeda. Int�ntelo con m�s palabras. Sin t�tulo Index: openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml 5 Jun 2006 00:02:40 -0000 1.3 +++ openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml 15 Dec 2006 00:02:16 -0000 1.4 @@ -2,27 +2,35 @@ Geavanceerd zoeken + "<b>AND</b>"-operator is onnodig -- we gebruiken standaard alle zoektermen. eender wanneer Datumbereik details + Tonen Doe een gok "<b>%stopwords%</b>" is een zeer veel voorkomend woord en is niet in de zoekopdracht meegenomen. FtsEngineDriver niet beschikbaar Let op dat alle woorden correct gespeld zijn. + Geen pagina's die "<b>%query%</b>" bevatten. + De volgende woorden komen zeer veel voor en zijn niet in de zoekopdracht meegenomen: +<strong>%stopwords;noquote%</strong>. Probeer andere kernwoorden. Probeer meer algemene kernwoorden. Probeer je zoekvraag op: %stw;noquote% Je moet een aantal kernwoorden opgeven. Volgende + Volgende afgelopen 3 maanden afgelopen 6 maanden afgelopen jaar Vorige Resultaatpagina: Resultaten + Resultaten <b>%low% - %high%</b> uit ongeveer <b>%count%</b>. Zoektocht vergde %elapsed% seconds. Zoeken Gezocht naar: %query% Suggesties: + Tip: In de meeste browsers kunt u gewoon op return drukken in plaats van op de zoekknop. Probeer minder kernwoorden. Naamloos Index: openacs-4/packages/search/catalog/search.nl_ZA.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.nl_ZA.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/search/catalog/search.nl_ZA.ISO-8859-1.xml 15 Dec 2006 00:02:16 -0000 1.2 @@ -0,0 +1,35 @@ + + + + Gevorderde soektog + "<b>AND</b>"-operator is onnodig -- ons gebruik standaard alle soekterme. + eender wanneer + Datumbereik + details + Toon + Doen 'n gok + "<b>%stopwords%</b>" is 'n nogal baie voorkomend woord en is nie in die soekopdrag meegeneem nie. + FtsEngineDriver nie beskikbaar nie + Let op dat alle woorde korrek gespel is. + Geen bladsye gevind nie met " + Die volgende woorde kom nogal baie voor en is nie in die soekopdrag meegeneem nie: + Probeer andere kernwoorde. + Probeer meer algemene kernwoorden. + Probeer jou soekvraag op: %stw;noquote% + Jy moet 'n aantal kernwoorde opgeef + Volgende + Soek is momenteel nie gekonfigureer nie. Alleen die webbaas kan dit inskakel. + afgelope 3 maande + afgelope 6 maande + afgelope jaar + Vorige + Resultaatbladsy: + resultate + Resultate <b>%low% - %high%</b> uit ongeveer <b>%count%</b>. Soektog het %elapsed% seconde geverg. + Soek + Gesoek na: %query% + Suggesties: + Tip: In die meeste blaaiers kan u gewoon op "return" druk in plaas van op die soekknop. + Probeer minder kernwoorde. + Naamloos + Index: openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml 5 Jun 2006 00:02:40 -0000 1.3 +++ openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml 15 Dec 2006 00:02:16 -0000 1.4 @@ -1,6 +1,7 @@ + Nie znaleziono stron zawierających "<b>%query%</b>". Spróbuj z innymi słowami kluczowymi. Spróbuj bardziej ogólnych słów kluczowych. Musisz podać jakieś słowa kluczowe. Index: openacs-4/packages/search/catalog/search.pt_BR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.pt_BR.ISO-8859-1.xml,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/search/catalog/search.pt_BR.ISO-8859-1.xml 15 Dec 2006 00:02:16 -0000 1.2 @@ -0,0 +1,35 @@ + + + + Busca Avan�ada + O operator "<b>AND</b>" � desnecess�rio - n�s inclu�mos todos os termos de busca como padr�o + qualquer hora + Intervalo de Data + detelhes + Exibir + Sinto-me com Sorte + "<b>%stopwords%</b>" � uma palavra muito comum e n�o foi inclu�da na sua pesquisa. + FtsEngineDriver n�o est� dispon�vel! + Tenha certeza de que todas as palavras s�o soletradas corretamente. + N�o foram encontradas p�ginas contendo "<b>%query%</b>". + As palavras seguintes s�o muito comuns e n�o foram inclu�das na sua busca: <strong>%stopwords;noquote%</strong>. + Tente palavras-chave diferentes. + Tente palavras-chave mais espec�ficas. + Tente sua pergunta em: %stw;noquote% + Voc� precisa especificar algumas palavras-chave. + Pr�ximo + A busca n�o est� configurada corretamente. Por favor contate o administrador do site para ativ�-la. + 3 meses depois + 6 meses depois + ano passado + Anterior + P�gina de resultados: + resultados + Resultados <b>%low% - %high%</b> de aproximadamente <b>%count%</b>. A busca levou %elapsed% segundos. + Busca + Busca realizada por: <b>%query%</b> + Sugest�es + Dica: Na maioria dos navegadores voc� pode apenas apertar enter ao inv�s de clicar no bot�o buscar. + Tente menos palavras-chave + Sem T�tulo + Index: openacs-4/packages/search/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/search/www/search.tcl 13 Nov 2006 00:55:40 -0000 1.23 +++ openacs-4/packages/search/www/search.tcl 15 Dec 2006 00:02:18 -0000 1.24 @@ -97,12 +97,12 @@ if { $offset < 0 } { set offset 0 } set params [list $q $offset $limit $user_id $df] -if {[ad_parameter -package_id $package_id SubsiteSearchP -default 1] +if {$search_package_id eq "" && [ad_parameter -package_id $package_id SubsiteSearchP -default 1] && [subsite::main_site_id] != [ad_conn subsite_id]} { # We are in a subsite and SubsiteSearchP is true lappend params [concat [ad_conn subsite_id] [subsite::util::packages -node_id [ad_conn node_id]]] } else { - lappend params {} + lappend params $search_package_id } set t0 [clock clicks -milliseconds] @@ -195,8 +195,8 @@ set url_previous "" set url_next "" -append url_previous "search?q=${urlencoded_query}" -append url_next "search?q=${urlencoded_query}" +append url_previous "search?q=${urlencoded_query}&search_package_id=$search_package_id" +append url_next "search?q=${urlencoded_query}&search_package_id=$search_package_id" if { [expr $current_result_page - 1] > $from_result_page } { append url_previous "&offset=[expr ($current_result_page - 2) * $limit]" } Index: openacs-4/www/blank-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v diff -u -N -r1.19 -r1.20 --- openacs-4/www/blank-master.adp 4 Jun 2006 00:45:56 -0000 1.19 +++ openacs-4/www/blank-master.adp 15 Dec 2006 00:02:19 -0000 1.20 @@ -7,7 +7,7 @@ - +