Skip to content

Commit 2b7b5da

Browse files
author
Arunmozhi
committed
changed the ungrouped groupid to 0 from NULL
1 parent 6880a76 commit 2b7b5da

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

scripts/symbol_xml2db.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090
symdom.getElementsByTagName( "layer" )[ layerno ].appendChild( symbol )
9191
c.execute( "UPDATE symbol SET xml=? WHERE name=?", ( symdom.toxml(), parent_name ))
9292
else:
93-
c.execute( "INSERT INTO symbol VALUES (?,?,?,?)", ( None, symbol_name, symbol.toxml(), None ) )
93+
c.execute( "INSERT INTO symbol VALUES (?,?,?,?)", ( None, symbol_name, symbol.toxml(), 0 ) )
9494
conn.commit()
9595

9696

9797
# ColorRamps
9898
colorramps = dom.getElementsByTagName( "colorramp" )
9999
for ramp in colorramps:
100100
ramp_name = ramp.getAttribute( "name" )
101-
c.execute( "INSERT INTO colorramp VALUES (?,?,?,?)", ( None, ramp_name, ramp.toxml(), None ) )
101+
c.execute( "INSERT INTO colorramp VALUES (?,?,?,?)", ( None, ramp_name, ramp.toxml(), 0 ) )
102102
conn.commit()
103103

104104
# Finally close the sqlite cursor

src/core/symbology-ng/qgsstylev2.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -512,15 +512,11 @@ QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid )
512512
char *query;
513513
if ( type == SymbolEntity )
514514
{
515-
query = groupid
516-
? sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid=%d", groupid )
517-
: sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid IS NULL" );
515+
query = sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid=%d", groupid );
518516
}
519517
else if ( type == ColorrampEntity )
520518
{
521-
query = groupid
522-
? sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid=%d", groupid )
523-
: sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid IS NULL" );
519+
query = sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid=%d", groupid );
524520
}
525521
else
526522
{
@@ -734,14 +730,10 @@ bool QgsStyleV2::group( StyleEntity type, QString name, int groupid )
734730
switch ( type )
735731
{
736732
case SymbolEntity:
737-
query = groupid
738-
? sqlite3_mprintf( "UPDATE symbol SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() )
739-
: sqlite3_mprintf( "UPDATE symbol SET groupid=NULL WHERE name='%q'", name.toUtf8().constData() );
733+
query = sqlite3_mprintf( "UPDATE symbol SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() );
740734
break;
741735
case ColorrampEntity:
742-
query = groupid
743-
? sqlite3_mprintf( "UPDATE colorramp SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() )
744-
: sqlite3_mprintf( "UPDATE colorramp SET groupid=NULL WHERE name='%q'", name.toUtf8().constData() );
736+
query = sqlite3_mprintf( "UPDATE colorramp SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() );
745737
break;
746738

747739
default:

0 commit comments

Comments
 (0)