Version 0.28.150.28.15stable

9 files changed, 44 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 49cb8fcb..4364e030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 MyRuLib: свободная (бесплатная и открытая) программа для 

 организации домашней библиотеки (коллекции) электронных книг.

 

+==== Версия 0.28.15 (10.02.2012 г.) ====

+Доработки и исправление ошибок:

+* Исправлена ошибка в параметрах библиотеки. 

+

 ==== Версия 0.28.14 (09.02.2012 г.) ====

 Доработки и исправление ошибок:

 * Настройка шаблона адресной строки для скачивания в параметрах библиотеки.

diff --git a/configure b/configure
index 61ef22e7..19350a6e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for MyRuLib 0.28.14.
+# Generated by GNU Autoconf 2.68 for MyRuLib 0.28.15.
 #
 # Report bugs to <mail@lintest.ru>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='MyRuLib'
 PACKAGE_TARNAME='myrulib'
-PACKAGE_VERSION='0.28.14'
-PACKAGE_STRING='MyRuLib 0.28.14'
+PACKAGE_VERSION='0.28.15'
+PACKAGE_STRING='MyRuLib 0.28.15'
 PACKAGE_BUGREPORT='mail@lintest.ru'
 PACKAGE_URL='http://myrulib.lintest.ru/'
 
@@ -1345,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
   # 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 MyRuLib 0.28.14 to adapt to many kinds of systems.
+\`configure' configures MyRuLib 0.28.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1411,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MyRuLib 0.28.14:";;
+     short | recursive ) echo "Configuration of MyRuLib 0.28.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1538,7 +1538,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MyRuLib configure 0.28.14
+MyRuLib configure 0.28.15
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1915,7 +1915,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MyRuLib $as_me 0.28.14, which was
+It was created by MyRuLib $as_me 0.28.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -9775,7 +9775,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by MyRuLib $as_me 0.28.14, which was
+This file was extended by MyRuLib $as_me 0.28.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9838,7 +9838,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-MyRuLib config.status 0.28.14
+MyRuLib config.status 0.28.15
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 50da3ae2..458cef8c 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT([MyRuLib],[0.28.14],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
+AC_INIT([MyRuLib],[0.28.15],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
 
 dnl Set the minimum version of toolkit libs
 dnl ========================================================
diff --git a/debian/changelog b/debian/changelog
index d6c9e8f4..f52e5967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+myrulib (0.28.15-squeeze1) oneiric; urgency=low
+
+  Доработки и исправление ошибок:
+  * Исправлена ошибка в параметрах библиотеки. 
+
+ -- Denis Kandrashin <mail@lintest.ru>  Fri, 10 Feb 2012 00:45:55 +0400
+
 myrulib (0.28.14-squeeze1) oneiric; urgency=low
 
   Доработки и исправление ошибок:
diff --git a/rpmbuild/myrulib-cr.spec b/rpmbuild/myrulib-cr.spec
index 37af108d..b49f13c8 100644
--- a/rpmbuild/myrulib-cr.spec
+++ b/rpmbuild/myrulib-cr.spec
@@ -7,7 +7,7 @@
 #
 
 Name:           myrulib-cr
-Version:        0.28.14
+Version:        0.28.15
 Release:        0
 License:        GPL-3.0
 Summary:        E-Book Library Manager
diff --git a/rpmbuild/myrulib.spec b/rpmbuild/myrulib.spec
index 6f4f954c..c941a1e9 100644
--- a/rpmbuild/myrulib.spec
+++ b/rpmbuild/myrulib.spec
@@ -7,7 +7,7 @@
 #
 
 Name:           myrulib
-Version:        0.28.14
+Version:        0.28.15
 Release:        0
 License:        GPL-3.0
 Summary:        E-Book Library Manager
diff --git a/scripts/LibRusEc/convert.php b/scripts/LibRusEc/convert.php
index 51d6b8a2..f40bd222 100644
--- a/scripts/LibRusEc/convert.php
+++ b/scripts/LibRusEc/convert.php
@@ -14,7 +14,7 @@ function convert_authors($mysql_db, $sqlite_db, $min)
 	SELECT libavtorname.aid, libavtorname.FirstName, libavtorname.LastName, libavtorname.MiddleName, COUNT(libavtor.bid) as Number
 	FROM libavtors AS libavtorname INNER JOIN (
 	  SELECT DISTINCT libavtor.aid, libavtor.bid
-	  FROM libavtor INNER JOIN libbook ON libbook.bid=libavtor.bid AND libbook.Deleted<>1 
+	  FROM libavtor INNER JOIN libbook ON libbook.bid=libavtor.bid AND libbook.Deleted<>1 AND libavtor.role = 'a'
 	) AS libavtor ON libavtorname.aid=libavtor.aid 
     WHERE libavtorname.aid>$min
 	GROUP BY libavtorname.aid, libavtorname.FirstName, libavtorname.LastName, libavtorname.MiddleName
@@ -83,7 +83,7 @@ function convert_books($mysql_db, $sqlite_db, $min)
       CASE WHEN aid IS NULL THEN 0 ELSE aid END AS aid,
       CONCAT(libbook.bid, '.', libbook.FileType) AS FileName
     FROM libbook 
-      LEFT JOIN libavtor ON libbook.bid = libavtor.bid AND aid<>0
+      LEFT JOIN libavtor ON libbook.bid = libavtor.bid AND libavtor.role = 'a' AND libavtor.aid<>0
     WHERE libbook.Deleted<>1 AND libbook.bid>$min
   ";
 
diff --git a/sources/MyRuLib/FbCollection.cpp b/sources/MyRuLib/FbCollection.cpp
index 6510e686..6f1e5c89 100644
--- a/sources/MyRuLib/FbCollection.cpp
+++ b/sources/MyRuLib/FbCollection.cpp
@@ -442,26 +442,34 @@ void FbCollection::LoadParams()
 

 int FbCollection::GetParamInt(int param)

 {

-	wxCriticalSectionLocker locker(sm_section);

 	if (param >= 100) {

-		if (sm_params.count(param)) return sm_params[param].m_int;

+		wxCriticalSectionLocker locker(sm_section);

+		FbParamHash::const_iterator it = sm_params.find(param);

+		if (it != sm_params.end()) return it->second.m_int;

 	} else {

+		wxCriticalSectionLocker locker(sm_section);

 		FbCollection * collection = GetCollection();

-		if (collection && collection->m_params.count(param))

-			return collection->m_params[param].m_int;

+		if (collection) {

+			FbParamHash::const_iterator it = collection->m_params.find(param);

+			if (it != collection->m_params.end()) return it->second.m_int;

+		}

 	}

 	return FbParamItem::DefaultInt(param);

 }

 

 wxString FbCollection::GetParamStr(int param)

 {

-	wxCriticalSectionLocker locker(sm_section);

 	if (param >= 100) {

-		if (sm_params.count(param)) return sm_params[param].m_str;

+		wxCriticalSectionLocker locker(sm_section);

+		FbParamHash::const_iterator it = sm_params.find(param);

+		if (it != sm_params.end()) return it->second.m_str;

 	} else {

+		wxCriticalSectionLocker locker(sm_section);

 		FbCollection * collection = GetCollection();

-		if (collection && collection->m_params.count(param))

-			return collection->m_params[param].m_str;

+		if (collection) {

+			FbParamHash::const_iterator it = collection->m_params.find(param);

+			if (it != collection->m_params.end()) return it->second.m_str;

+		}

 	}

 	return FbParamItem::DefaultStr(param);

 }

diff --git a/sources/MyRuLib/FbParams.cpp b/sources/MyRuLib/FbParams.cpp
index 4a675b2e..c18f42fa 100644
--- a/sources/MyRuLib/FbParams.cpp
+++ b/sources/MyRuLib/FbParams.cpp
@@ -230,13 +230,13 @@ void FbParamItem::Set(wxWindowID winid, int param, const wxString &text)
 

 bool FbParamItem::IsGenesis()

 {

-	return FbParamItem(DB_LIBRARY_TYPE) == wxT("GENESIS");

+	return FbParamItem(DB_LIBRARY_TYPE).Str() == wxT("GENESIS");

 }

 

 long FbParamList::Style(long style) const

 {

-	return style 

-		| (FbParams(FB_GRID_VRULES) ? fbTR_VRULES : 0) 

+	return style

+		| (FbParams(FB_GRID_VRULES) ? fbTR_VRULES : 0)

 		| (FbParams(FB_GRID_HRULES) ? fbTR_HRULES : 0)

 	;

 }