Fwd: extragear/graphics/digikam/libs/database

Hi Marcel,

this commit broke the displaying of images in the iconview.
Nothing is displayed, slave is broken.
I double checked with git bisect, even restarted, it is definitely this
commit.

Andi


SVN commit 989986 by mwiesweg:

Reset collections as soon as parameters have changed

 M  +14 -12    collectionmanager.cpp  
 M  +1 -0      collectionmanager.h  
 M  +1 -0      databaseaccess.cpp  


--- trunk/extragear/graphics/digikam/libs/database/collectionmanager.cpp #989985:989986
@@ -596,22 +596,24 @@
     delete d;
 }
 
-void CollectionManager::refresh()
+void CollectionManager::clear()
 {
+    DatabaseAccess access;
+
+    // clear list
+    foreach (AlbumRootLocation *location, d->locations)
     {
-        DatabaseAccess access;
-
-        // clear list
-        foreach (AlbumRootLocation *location, d->locations)
-        {
-            CollectionLocation::Status oldStatus = location->status();
-            location->setStatus(CollectionLocation::LocationDeleted);
-            emit locationStatusChanged(*location, oldStatus);
-            delete location;
-        }
-        d->locations.clear();
+        CollectionLocation::Status oldStatus = location->status();
+        location->setStatus(CollectionLocation::LocationDeleted);
+        emit locationStatusChanged(*location, oldStatus);
+        delete location;
     }
+    d->locations.clear();
+}
 
+void CollectionManager::refresh()
+{
+    clear();
     updateLocations();
 }
 
--- trunk/extragear/graphics/digikam/libs/database/collectionmanager.h #989985:989986
@@ -57,6 +57,7 @@
     /**
      * Clears all locations and re-reads the lists of collection locations
      */
+    void clear();
     void refresh();
 
     /** CollectionLocation objects returned are simple data containers.
--- trunk/extragear/graphics/digikam/libs/database/databaseaccess.cpp #989985:989986
@@ -202,6 +202,7 @@
     delete d->infoCache;
     d->infoCache = new ImageInfoCache();
     d->databaseWatch->setDatabaseIdentifier(QString());
+    CollectionManager::instance()->clear();
 }
 
 bool DatabaseAccess::checkReadyForUse(InitializationObserver *observer)

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2009/7/1 Andi Clemens <[hidden email]>:
> Hi Marcel,
>
> this commit broke the displaying of images in the iconview.
> Nothing is displayed, slave is broken.
> I double checked with git bisect, even restarted, it is definitely this
> commit.

kioslave are re-installed (:=)) ?

>
> Andi
>
>
>
> ---------- Message transféré ----------
> From: Marcel Wiesweg <[hidden email]>
> To: [hidden email]
> Date: Wed, 01 Jul 2009 11:12:54 +0000
> Subject: extragear/graphics/digikam/libs/database
> SVN commit 989986 by mwiesweg:
>
> Reset collections as soon as parameters have changed
>
>  M  +14 -12    collectionmanager.cpp
>  M  +1 -0      collectionmanager.h
>  M  +1 -0      databaseaccess.cpp
>
>
> --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.cpp #989985:989986
> @@ -596,22 +596,24 @@
>     delete d;
>  }
>
> -void CollectionManager::refresh()
> +void CollectionManager::clear()
>  {
> +    DatabaseAccess access;
> +
> +    // clear list
> +    foreach (AlbumRootLocation *location, d->locations)
>     {
> -        DatabaseAccess access;
> -
> -        // clear list
> -        foreach (AlbumRootLocation *location, d->locations)
> -        {
> -            CollectionLocation::Status oldStatus = location->status();
> -            location->setStatus(CollectionLocation::LocationDeleted);
> -            emit locationStatusChanged(*location, oldStatus);
> -            delete location;
> -        }
> -        d->locations.clear();
> +        CollectionLocation::Status oldStatus = location->status();
> +        location->setStatus(CollectionLocation::LocationDeleted);
> +        emit locationStatusChanged(*location, oldStatus);
> +        delete location;
>     }
> +    d->locations.clear();
> +}
>
> +void CollectionManager::refresh()
> +{
> +    clear();
>     updateLocations();
>  }
>
> --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.h #989985:989986
> @@ -57,6 +57,7 @@
>     /**
>      * Clears all locations and re-reads the lists of collection locations
>      */
> +    void clear();
>     void refresh();
>
>     /** CollectionLocation objects returned are simple data containers.
> --- trunk/extragear/graphics/digikam/libs/database/databaseaccess.cpp #989985:989986
> @@ -202,6 +202,7 @@
>     delete d->infoCache;
>     d->infoCache = new ImageInfoCache();
>     d->databaseWatch->setDatabaseIdentifier(QString());
> +    CollectionManager::instance()->clear();
>  }
>
>  bool DatabaseAccess::checkReadyForUse(InitializationObserver *observer)
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

sure, I uninstalled everything... I restarted, I removed my build dir and
compiled everything from the beginning. This commit broke something.
Does it work for you?

Andi

On Wednesday 01 July 2009 13:32:48 Gilles Caulier wrote:

> 2009/7/1 Andi Clemens <[hidden email]>:
> > Hi Marcel,
> >
> > this commit broke the displaying of images in the iconview.
> > Nothing is displayed, slave is broken.
> > I double checked with git bisect, even restarted, it is definitely this
> > commit.
>
> kioslave are re-installed (:=)) ?
>
> > Andi
> >
> >
> >
> > ---------- Message transféré ----------
> > From: Marcel Wiesweg <[hidden email]>
> > To: [hidden email]
> > Date: Wed, 01 Jul 2009 11:12:54 +0000
> > Subject: extragear/graphics/digikam/libs/database
> > SVN commit 989986 by mwiesweg:
> >
> > Reset collections as soon as parameters have changed
> >
> >  M  +14 -12    collectionmanager.cpp
> >  M  +1 -0      collectionmanager.h
> >  M  +1 -0      databaseaccess.cpp
> >
> >
> > --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.cpp
> > #989985:989986 @@ -596,22 +596,24 @@
> >     delete d;
> >  }
> >
> > -void CollectionManager::refresh()
> > +void CollectionManager::clear()
> >  {
> > +    DatabaseAccess access;
> > +
> > +    // clear list
> > +    foreach (AlbumRootLocation *location, d->locations)
> >     {
> > -        DatabaseAccess access;
> > -
> > -        // clear list
> > -        foreach (AlbumRootLocation *location, d->locations)
> > -        {
> > -            CollectionLocation::Status oldStatus = location->status();
> > -            location->setStatus(CollectionLocation::LocationDeleted);
> > -            emit locationStatusChanged(*location, oldStatus);
> > -            delete location;
> > -        }
> > -        d->locations.clear();
> > +        CollectionLocation::Status oldStatus = location->status();
> > +        location->setStatus(CollectionLocation::LocationDeleted);
> > +        emit locationStatusChanged(*location, oldStatus);
> > +        delete location;
> >     }
> > +    d->locations.clear();
> > +}
> >
> > +void CollectionManager::refresh()
> > +{
> > +    clear();
> >     updateLocations();
> >  }
> >
> > --- trunk/extragear/graphics/digikam/libs/database/collectionmanager.h
> > #989985:989986 @@ -57,6 +57,7 @@
> >     /**
> >      * Clears all locations and re-reads the lists of collection
> > locations */
> > +    void clear();
> >     void refresh();
> >
> >     /** CollectionLocation objects returned are simple data containers.
> > --- trunk/extragear/graphics/digikam/libs/database/databaseaccess.cpp
> > #989985:989986 @@ -202,6 +202,7 @@
> >     delete d->infoCache;
> >     d->infoCache = new ImageInfoCache();
> >     d->databaseWatch->setDatabaseIdentifier(QString());
> > +    CollectionManager::instance()->clear();
> >  }
> >
> >  bool DatabaseAccess::checkReadyForUse(InitializationObserver *observer)
> >
> > _______________________________________________
> > Digikam-devel mailing list
> > [hidden email]
> > https://mail.kde.org/mailman/listinfo/digikam-devel
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2009/7/1 Andi Clemens <[hidden email]>:
> sure, I uninstalled everything... I restarted, I removed my build dir and
> compiled everything from the beginning. This commit broke something.
> Does it work for you?

Not tested yet. Win32 compilation under progress... (:=)))

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Ah ok! :-)
I tested it again, and it really isn't working.
I did:

1. sudo make uninstall
2. double check /usr for old digikam stuff
3. restarted
4. kbuildsycoca4 --noincremental
5. make -j4
6. sudo make -j4 install/fast
7. kbuildsycoca4 --noincremental

Nothing. So I guess it can be assumed that the slaves have properly reloaded.

Andi

On Wednesday 01 July 2009 13:43:56 Gilles Caulier wrote:

> 2009/7/1 Andi Clemens <[hidden email]>:
> > sure, I uninstalled everything... I restarted, I removed my build dir and
> > compiled everything from the beginning. This commit broke something.
> > Does it work for you?
>
> Not tested yet. Win32 compilation under progress... (:=)))
>
> Gilles
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

Oh and I even removed all caches, so that files need to be reloaded by the
kernel:

1. sync
2. echo 1 > /proc/sys/vm/drop_caches

Still nothing. I guess there is nothing more to test here ;-)

Andi

On Wednesday 01 July 2009 13:46:13 Andi Clemens wrote:

> Ah ok! :-)
> I tested it again, and it really isn't working.
> I did:
>
> 1. sudo make uninstall
> 2. double check /usr for old digikam stuff
> 3. restarted
> 4. kbuildsycoca4 --noincremental
> 5. make -j4
> 6. sudo make -j4 install/fast
> 7. kbuildsycoca4 --noincremental
>
> Nothing. So I guess it can be assumed that the slaves have properly
> reloaded.
>
> Andi
>
> On Wednesday 01 July 2009 13:43:56 Gilles Caulier wrote:
> > 2009/7/1 Andi Clemens <[hidden email]>:
> > > sure, I uninstalled everything... I restarted, I removed my build dir
> > > and compiled everything from the beginning. This commit broke
> > > something. Does it work for you?
> >
> > Not tested yet. Win32 compilation under progress... (:=)))
> >
> > Gilles
> > _______________________________________________
> > Digikam-devel mailing list
> > [hidden email]
> > https://mail.kde.org/mailman/listinfo/digikam-devel
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

Marcel, I can confirm. KIOSlave are loaded but nothing work. Icon view
still empty.

Gilles

2009/7/1 Andi Clemens <[hidden email]>:

> Oh and I even removed all caches, so that files need to be reloaded by the
> kernel:
>
> 1. sync
> 2. echo 1 > /proc/sys/vm/drop_caches
>
> Still nothing. I guess there is nothing more to test here ;-)
>
> Andi
>
> On Wednesday 01 July 2009 13:46:13 Andi Clemens wrote:
>> Ah ok! :-)
>> I tested it again, and it really isn't working.
>> I did:
>>
>> 1. sudo make uninstall
>> 2. double check /usr for old digikam stuff
>> 3. restarted
>> 4. kbuildsycoca4 --noincremental
>> 5. make -j4
>> 6. sudo make -j4 install/fast
>> 7. kbuildsycoca4 --noincremental
>>
>> Nothing. So I guess it can be assumed that the slaves have properly
>> reloaded.
>>
>> Andi
>>
>> On Wednesday 01 July 2009 13:43:56 Gilles Caulier wrote:
>> > 2009/7/1 Andi Clemens <[hidden email]>:
>> > > sure, I uninstalled everything... I restarted, I removed my build dir
>> > > and compiled everything from the beginning. This commit broke
>> > > something. Does it work for you?
>> >
>> > Not tested yet. Win32 compilation under progress... (:=)))
>> >
>> > Gilles
>> > _______________________________________________
>> > Digikam-devel mailing list
>> > [hidden email]
>> > https://mail.kde.org/mailman/listinfo/digikam-devel
>>
>> _______________________________________________
>> Digikam-devel mailing list
>> [hidden email]
>> https://mail.kde.org/mailman/listinfo/digikam-devel
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

To be more precise, icon view is broken with :

Album
Tags
Dates
TimeLine
Advanced Searches
Map searches


... but wortk fine with :

FuzzySearches

Gilles

2009/7/1 Gilles Caulier <[hidden email]>:

> Marcel, I can confirm. KIOSlave are loaded but nothing work. Icon view
> still empty.
>
> Gilles
>
> 2009/7/1 Andi Clemens <[hidden email]>:
>> Oh and I even removed all caches, so that files need to be reloaded by the
>> kernel:
>>
>> 1. sync
>> 2. echo 1 > /proc/sys/vm/drop_caches
>>
>> Still nothing. I guess there is nothing more to test here ;-)
>>
>> Andi
>>
>> On Wednesday 01 July 2009 13:46:13 Andi Clemens wrote:
>>> Ah ok! :-)
>>> I tested it again, and it really isn't working.
>>> I did:
>>>
>>> 1. sudo make uninstall
>>> 2. double check /usr for old digikam stuff
>>> 3. restarted
>>> 4. kbuildsycoca4 --noincremental
>>> 5. make -j4
>>> 6. sudo make -j4 install/fast
>>> 7. kbuildsycoca4 --noincremental
>>>
>>> Nothing. So I guess it can be assumed that the slaves have properly
>>> reloaded.
>>>
>>> Andi
>>>
>>> On Wednesday 01 July 2009 13:43:56 Gilles Caulier wrote:
>>> > 2009/7/1 Andi Clemens <[hidden email]>:
>>> > > sure, I uninstalled everything... I restarted, I removed my build dir
>>> > > and compiled everything from the beginning. This commit broke
>>> > > something. Does it work for you?
>>> >
>>> > Not tested yet. Win32 compilation under progress... (:=)))
>>> >
>>> > Gilles
>>> > _______________________________________________
>>> > Digikam-devel mailing list
>>> > [hidden email]
>>> > https://mail.kde.org/mailman/listinfo/digikam-devel
>>>
>>> _______________________________________________
>>> Digikam-devel mailing list
>>> [hidden email]
>>> https://mail.kde.org/mailman/listinfo/digikam-devel
>>
>> _______________________________________________
>> Digikam-devel mailing list
>> [hidden email]
>> https://mail.kde.org/mailman/listinfo/digikam-devel
>>
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Marcel Wiesweg]

> Hi Marcel,
>
> this commit broke the displaying of images in the iconview.
> Nothing is displayed, slave is broken.
> I double checked with git bisect, even restarted, it is definitely this
> commit.
>

Yes sorry, I dont always run "make install" so i did not notice this.
Should be fixed now.

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

yes. Fixed...

Gilles

2009/7/1 Marcel Wiesweg <[hidden email]>:

>> Hi Marcel,
>>
>> this commit broke the displaying of images in the iconview.
>> Nothing is displayed, slave is broken.
>> I double checked with git bisect, even restarted, it is definitely this
>> commit.
>>
>
> Yes sorry, I dont always run "make install" so i did not notice this.
> Should be fixed now.
>
> _______________________________________________
> Digikam-devel mailing list
> [hidden email]
> https://mail.kde.org/mailman/listinfo/digikam-devel
>

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel