Hello community, here is the log from the commit of package yast2-scanner checked in at Thu Nov 16 13:29:48 CET 2006. -------- --- yast2-scanner/yast2-scanner.changes 2006-11-15 13:06:33.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-scanner/yast2-scanner.changes 2006-11-16 12:20:27.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 16 11:47:01 CET 2006 - jsmeix@suse.de + +- V 2.14.8 +- Using better syntax for the model preselection code + (regarding access integer values in term types). + +------------------------------------------------------------------- Old: ---- yast2-scanner-2.14.7.tar.bz2 New: ---- yast2-scanner-2.14.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-scanner.spec ++++++ --- /var/tmp/diff_new_pack.TS7WMr/_old 2006-11-16 13:28:39.000000000 +0100 +++ /var/tmp/diff_new_pack.TS7WMr/_new 2006-11-16 13:28:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-scanner (Version 2.14.7) +# spec file for package yast2-scanner (Version 2.14.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-scanner -Version: 2.14.7 +Version: 2.14.8 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-scanner-2.14.7.tar.bz2 +Source0: yast2-scanner-2.14.8.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 @@ -41,7 +41,7 @@ Johannes Meixner <jsmeix@suse.de> %prep -%setup -n yast2-scanner-2.14.7 +%setup -n yast2-scanner-2.14.8 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,10 @@ %doc %{prefix}/share/doc/packages/yast2-scanner %changelog -n yast2-scanner +* Thu Nov 16 2006 - jsmeix@suse.de +- V 2.14.8 +- Using better syntax for the model preselection code + (regarding access integer values in term types). * Wed Nov 15 2006 - jsmeix@suse.de - V 2.14.7 - Improved how a model is preselected in the model_items list. ++++++ yast2-scanner-2.14.7.tar.bz2 -> yast2-scanner-2.14.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.7/VERSION new/yast2-scanner-2.14.8/VERSION --- old/yast2-scanner-2.14.7/VERSION 2006-11-15 13:00:28.000000000 +0100 +++ new/yast2-scanner-2.14.8/VERSION 2006-11-16 11:46:59.000000000 +0100 @@ -1 +1 @@ -2.14.7 +2.14.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.7/configure new/yast2-scanner-2.14.8/configure --- old/yast2-scanner-2.14.7/configure 2006-11-15 13:02:01.000000000 +0100 +++ new/yast2-scanner-2.14.8/configure 2006-11-16 12:07:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.7. +# Generated by GNU Autoconf 2.59 for yast2-scanner 2.14.8. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-scanner' PACKAGE_TARNAME='yast2-scanner' -PACKAGE_VERSION='2.14.7' -PACKAGE_STRING='yast2-scanner 2.14.7' +PACKAGE_VERSION='2.14.8' +PACKAGE_STRING='yast2-scanner 2.14.8' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-scanner 2.14.7 to adapt to many kinds of systems. +\`configure' configures yast2-scanner 2.14.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-scanner 2.14.7:";; + short | recursive ) echo "Configuration of yast2-scanner 2.14.8:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-scanner configure 2.14.7 +yast2-scanner configure 2.14.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-scanner $as_me 2.14.7, which was +It was created by yast2-scanner $as_me 2.14.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-scanner' - VERSION='2.14.7' + VERSION='2.14.8' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.7" +VERSION="2.14.8" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-scanner $as_me 2.14.7, which was +This file was extended by yast2-scanner $as_me 2.14.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-scanner config.status 2.14.7 +yast2-scanner config.status 2.14.8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.7/configure.in new/yast2-scanner-2.14.8/configure.in --- old/yast2-scanner-2.14.7/configure.in 2006-11-15 13:01:58.000000000 +0100 +++ new/yast2-scanner-2.14.8/configure.in 2006-11-16 12:07:30.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-scanner, 2.14.7, http://bugs.opensuse.org/, yast2-scanner) +AC_INIT(yast2-scanner, 2.14.8, http://bugs.opensuse.org/, yast2-scanner) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.7" +VERSION="2.14.8" RPMNAME="yast2-scanner" MAINTAINER="Johannes Meixner <jsmeix@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-scanner-2.14.7/src/Scanner.ycp new/yast2-scanner-2.14.8/src/Scanner.ycp --- old/yast2-scanner-2.14.7/src/Scanner.ycp 2006-11-15 13:04:02.000000000 +0100 +++ new/yast2-scanner-2.14.8/src/Scanner.ycp 2006-11-16 12:20:09.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Scanner settings, input and output functions * Authors: Johannes Meixner <jsmeix@suse.de> * - * $Id: Scanner.ycp 34403 2006-11-15 12:04:00Z jsmeix $ + * $Id: Scanner.ycp 34429 2006-11-16 11:20:06Z jsmeix $ * * Representation of the configuration of scanner. * Input and output routines. @@ -1244,12 +1244,15 @@ } // If there is an autodetected USB scanner selected, // test whether an USB-ID in the database matches to the selected autodetected scanner - // and select it in the model_items list if it is at least "good" supported. - // This means if the support status is "complete" or "good" - // and there is no special setup for firmware upload required + // and select it in the model_items list if it is at least "good supported" + // where "good supported" means that the support status is "complete" or "good" + // and there is no special (manual) setup for firmware upload required // (automated firmware upload as e.g. "epkowa" does is "good"). - // Do not select a model if it is less than "good" supported to avoid - // that the user clicks too fast [Next] without having at least a look + // Do not select a model if it is less than "good supported" to avoid that + // there is another driver entry in the database which has no USB-ID + // but which provides much better support (e.g. the model entry with USB-ID + // provides minimal support but an entry without USB-ID provides good support) + // and to avoid that the user clicks too fast [Next] without having a look // what there was selected (e.g. ignoring any comment regarding the model). // If more than one model in the database matches, select those model // with the better support status (complete > good). @@ -1277,7 +1280,7 @@ { // There is no model selected. // Select the current model: selected_model_database_index = database_index; - y2milestone( "Preselected model: %1", model_string ); + y2milestone( "Selected model: %1", model_string ); } else { // There is already a model selected. @@ -1287,7 +1290,7 @@ { if( "complete" == status ) { // Select the current model: selected_model_database_index = database_index; - y2milestone( "Preselected other model: %1", model_string ); + y2milestone( "Selected other model: %1", model_string ); } } else @@ -1300,7 +1303,7 @@ // than any other driver (in particular better than epson, plustek, or snapscan). // Select the current model: selected_model_database_index = database_index; - y2milestone( "Preselected other model: %1", model_string ); + y2milestone( "Selected other model: %1", model_string ); } else { if( backend == "hpaio" ) @@ -1308,7 +1311,7 @@ // than any other driver (in particular better than the outdated hpoj). // Select the current model: selected_model_database_index = database_index; - y2milestone( "Preselected other model: %1", model_string ); + y2milestone( "Selected other model: %1", model_string ); } } } @@ -1317,14 +1320,15 @@ if( backend == "epkowa" ) { // Many models for the epkowa driver are available under two names. // One name is the "overseas version" of the Japanese name. - // This is mentioned in the comment, e.g. the model "Perfection 1200U PHOTO" has - // the comment "overseas version of the GT-7600UF, Perfection 1200U with TPU option bundled". + // This is mentioned in the comment, e.g. the "Perfection 1200U PHOTO" has the comment + // "overseas version of the GT-7600UF, Perfection 1200U with TPU option bundled". // Prefer the "overseas version" entry because most users are "overseas" - // and users in Japan find their model name in the comment: + // (from the Japanese point of view) and even users in Japan find their model name + // in the comment (which is not true the other way round): if( regexpmatch( tolower( comment ), tolower( "overseas version" ) ) ) { // Select the current model: selected_model_database_index = database_index; - y2milestone( "Preselected other model: %1", model_string ); + y2milestone( "Selected other model: %1", model_string ); } } } @@ -1333,16 +1337,16 @@ } } // Take the filter_string into account: - if( "" != filter_string ) + if( "" == filter_string ) + { model_items = add( model_items, `item( `id( database_index ), model_string ) ); + } + else { // If the filter_string is not the empty string then // test whether the model_string matches to the filter_string: if( regexpmatch( tolower( model_string ), tolower( filter_string ) ) ) { model_items = add( model_items, `item( `id( database_index ), model_string ) ); } } - else - { model_items = add( model_items, `item( `id( database_index ), model_string ) ); - } } } ); @@ -1358,19 +1362,26 @@ model_items, { // Set the model_items_index to the index number of the current model_item: model_items_index = model_items_index + 1; - // Extract the database_index value from the model_item - // (model_item[0] is `id(database_index) and model_item[1] is the model_string): - database_index = tointeger( filterchars( tostring( model_item[0]:dummy ), "0123456789" ) ); - if( selected_model_database_index == database_index ) + // model_item[0] is the term `id(database_index) and id[0] is the database_index + // so that model_item[0,0] is the database_index: + if( selected_model_database_index == model_item[0,0]:-1 ) { selected_model_items_index = model_items_index; } } ); if( selected_model_items_index >= 0 ) - { // Actually preselect the entry: - database_index = tointeger( filterchars( tostring( model_items[selected_model_items_index,0]:dummy ), "0123456789" ) ); + { // Actually preselect the entry. + // model_items[selected_model_items_index] is a model_item and + // model_item[1] is the model_string and + // model_item[0,0] is the database_index (see the previous comment) so that + // model_items[selected_model_items_index,0,0] is the database_index: + database_index = model_items[selected_model_items_index,0,0]:-1; model_string = model_items[selected_model_items_index,1]:""; model_items[selected_model_items_index] = `item( `id( database_index ), model_string, true ); + y2milestone( "Preselected model shown to the user: %1", model_string ); + } + else + { y2milestone( "No preselected model shown to the user. The filter_string is: '%1'", filter_string ); } // Return a list which is sorted according to the model_string entries // (model_item[0] is `id(database_index) and model_item[1] is the model_string): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org