GNOME.org
 

tracker r1598 - in branches/xesam-support: . data/services src/libtracker-db

Author: pvanhoof
Date: Fri Jun  6 13:26:20 2008
New Revision: 1598
URL: http://svn.gnome.org/viewvc/tracker?rev=1598&view=rev

Log:
	* svn merge -r 1591:1597 ../indexer-split


Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/data/services/application.metadata
   branches/xesam-support/data/services/audio.metadata
   branches/xesam-support/data/services/default.metadata
   branches/xesam-support/data/services/document.metadata
   branches/xesam-support/data/services/file.metadata
   branches/xesam-support/data/services/video.metadata
   branches/xesam-support/src/libtracker-db/tracker-db-manager.c

Modified: branches/xesam-support/data/services/application.metadata
==============================================================================
--- branches/xesam-support/data/services/application.metadata	(original)
+++ branches/xesam-support/data/services/application.metadata	Fri Jun  6 13:26:20 2008
@@ -1,7 +1,7 @@
 [App:Name]
 DisplayName=Name
 Description=Application name
-DataType=Indexable
+DataType=index
 Weight=25
 Filtered=false
 
@@ -9,47 +9,47 @@
 [App:DisplayName]
 DisplayName=Display name
 Description=Application display name
-DataType=Indexable
+DataType=index
 Weight=10
 Filtered=false
 
 [App:GenericName]
 DisplayName=Generic name
 Description=Application generic name
-DataType=Indexable
+DataType=index
 Weight=10
 Filtered=false
 
 [App:Comment]
 DisplayName=Comments
 Description=Application comments
-DataType=Indexable
+DataType=index
 Weight=5
 
 
 [App:Exec]
 DisplayName=Name
 Description=Application name
-DataType=String
+DataType=string
 Weight=1
 
 [App:Icon]
 DisplayName=Icon
 Description=Application icon name
-DataType=String
+DataType=string
 Weight=1
 
 [App:MimeType]
 DisplayName=Mime type
 Description=Application supported mime types
-DataType=Keyword
+DataType=keyword
 Weight=1
 MultipleValues=true
 
 [App:Categories]
 DisplayName=Categories
 Description=Application categories
-DataType=Keyword
+DataType=keyword
 Weight=5
 MultipleValues=true
 

Modified: branches/xesam-support/data/services/audio.metadata
==============================================================================
--- branches/xesam-support/data/services/audio.metadata	(original)
+++ branches/xesam-support/data/services/audio.metadata	Fri Jun  6 13:26:20 2008
@@ -1,7 +1,7 @@
 [Audio:Title]
 DisplayName=Title
 Description=Track title
-DataType=Indexable
+DataType=index
 Parent=DC:Title
 Weight=20
 Filtered=false
@@ -9,7 +9,7 @@
 [Audio:Artist]
 DisplayName=Artist
 Description=Track artist
-DataType=Indexable
+DataType=index
 Parent=DC:Creator
 Weight=15
 Filtered=false
@@ -17,14 +17,14 @@
 [Audio:Album]
 DisplayName=Title
 Description=Track title
-DataType=Indexable
+DataType=index
 Weight=10
 Filtered=false
 
 [Audio:Genre]
 DisplayName=Genre
 Description=The type or genre of the music track
-DataType=Keyword
+DataType=keyword
 Parent=DC:Type
 Weight=5
 MultipleValues=true
@@ -32,18 +32,18 @@
 [Audio:Duration]
 DisplayName=Duration
 Description=The length in seconds of the music track
-DataType=Integer
+DataType=integer
 
 [Audio:ReleaseDate]
 DisplayName=Release date
 Description=The date the track was released
-DataType=DateTime
+DataType=date
 Parent=DC:Date
 
 [Audio:AlbumArtist]
 DisplayName=Album artist
 Description=The artist of the track's album
-DataType=Indexable
+DataType=index
 Parent=DC:Creator
 Weight=10
 Filtered=false
@@ -51,22 +51,22 @@
 [Audio:AlbumTrackCount]
 DisplayName=Album track count
 Description=The number of tracks in the album
-DataType=Integer
+DataType=integer
 
 [Audio:TrackNo]
 DisplayName=Track number
 Description=The position of the track relative to the others
-DataType=Integer
+DataType=integer
 
 [Audio:DiscNo]
 DisplayName=Disc number
 Description=On which disc the track is located
-DataType=Integer
+DataType=integer
 
 [Audio:Performer]
 DisplayName=Performer
 Description=The individual or group performing the track
-DataType=Indexable
+DataType=index
 Weight=5
 Parent=DC:Contributor
 MultipleValues=true
@@ -74,100 +74,100 @@
 [Audio:TrackGain]
 DisplayName=Track gain
 Description=The amount of gain needed for the track
-DataType=Double
+DataType=double
 
 [Audio:PeakTrackGain]
 DisplayName=Peak track gain
 Description=The peak amount of gain needed for the track
-DataType=Double
+DataType=double
 
 [Audio:AlbumGain]
 DisplayName=Album gain
 Description=The amount of gain needed for the entire album
-DataType=Double
+DataType=double
 
 [Audio:AlbumPeakGain]
 DisplayName=Peak album gain
 Description=The peak amount of gain needed for the entire album
-DataType=Double
+DataType=double
 
 [Audio:Comment]
 DisplayName=Comments
 Description=General purpose comments
-DataType=Indexable
+DataType=index
 Weight=1
 Parent=DC:Description
 
 [Audio:Codec]
 DisplayName=Codec
 Description=Codec name
-DataType=Indexable
+DataType=index
 Weight=1
 
 [Audio:CodecVersion]
 DisplayName=Codec version
 Description=Codec version string
-DataType=String
+DataType=string
 
 [Audio:Samplerate]
 DisplayName=Sample rate
 Description=Sample rate of track in Hz
-DataType=Double
+DataType=double
 
 [Audio:Bitrate]
 DisplayName=Bitrate
 Description=Bitrate in bits/sec
-DataType=Double
+DataType=double
 
 [Audio:Channels]
 DisplayName=Channels
 Description=The number of channels in the track
-DataType=Integer
+DataType=integer
 
 [Audio:LastPlay]
 DisplayName=Last Played
 Description=The date and time the track was last played
-DataType=DateTime
+DataType=date
 Parent=DC:Date
 
 [Audio:PlayCount]
 DisplayName=Play Count
 Description=Number of times the track has been played
-DataType=Integer
+DataType=integer
 
 [Audio:DateAdded]
 DisplayName=Date Added
 Description=Date track was first added
-DataType=DateTime
+DataType=date
 
 [Audio:Lyrics]
 DisplayName=Lyrics
 Description=Lyrics of the track
-DataType=Indexable
+DataType=index
 weight=1
 
 [Audio:MBAlbumID]
 DisplayName=MusicBrainz album ID
 Description=The MusicBrainz album ID for the track
-DataType=String
+DataType=string
 Parent=DC:Identifier
 
 [Audio:MBArtistID]
 DisplayName=MusicBrainz artist ID
 Description=The MusicBrainz artist ID for the track
-DataType=String
+DataType=string
 Parent=DC:Identifier
 
 [Audio:MBAlbumArtistID]
 DisplayName=MusicBrainz album artist ID
 Description=The MusicBrainz album artist ID for the track
-DataType=String
+DataType=string
 Parent=DC:Identifier
 
 [Audio:MBTrackID]
 DisplayName=MusicBrainz track ID
 Description=The MusicBrainz track ID
-DataType=String
+DataType=string
 Parent=DC:Identifier
 
 

Modified: branches/xesam-support/data/services/default.metadata
==============================================================================
--- branches/xesam-support/data/services/default.metadata	(original)
+++ branches/xesam-support/data/services/default.metadata	Fri Jun  6 13:26:20 2008
@@ -2,110 +2,110 @@
 Abstract=true
 DisplayName=Contributor
 Description=Contributors to the resource (other than the authors)
-DataType=Indexable
+DataType=index
 
 [DC:Coverage]
 Abstract=true
 DisplayName=Coverage
 Description=The extent or scope of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Creator]
 Abstract=true
 DisplayName=Author
 Description=The authors of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Date]
 Abstract=true
 DisplayName=Date
 Description=Date that something interesting happened to the resource
-DataType=DateTime
+DataType=date
 
 [DC:Description]
 Abstract=true
 DisplayName=Description
 Description=A textual description of the content of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Format]
 Abstract=true
 DisplayName=Format
 Description=The file format(mime) or type used when saving the resource
-DataType=Keyword
+DataType=keyword
 
 [DC:Identifier]
 Abstract=true
 DisplayName=Identifier
 Description=Unique identifier of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Language]
 Abstract=true
 DisplayName=Langauge
 Description=Language used in the resource
-DataType=Indexable
+DataType=index
 
 [DC:Publishers]
 Abstract=true
 DisplayName=Publishers
 Description=Publishers of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Relation]
 Abstract=true
 DisplayName=Relationship
 Description=Relationships to other resources
-DataType=Indexable
+DataType=index
 
 [DC:Rights]
 Abstract=true
 DisplayName=Rights
 Description=Informal rights statement of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Source]
 Abstract=true
 DisplayName=Source
 Description=Unique identifier of the work from which this resource was derived
-DataType=Indexable
+DataType=index
 
 [DC:Subject]
 Abstract=true
 DisplayName=Subject
 Description=specifies the topic of the content of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Keywords]
 Abstract=true
 DisplayName=Keywords
 Description=Keywords that are used to tag a resource
-DataType=Keyword
+DataType=keyword
 
 [DC:Title]
 Abstract=true
 DisplayName=Title
 Description=specifies the topic of the content of the resource
-DataType=Indexable
+DataType=index
 
 [DC:Type]
 Abstract=true
 DisplayName=Type
 Description=specifies the type of the content of the resource
-DataType=Indexable
+DataType=index
 
 [User:Rank]
 DisplayName=Rank
 Description=User settable rank or score of the resource
 FieldName=Rank
-DataType=Integer
+DataType=integer
 Embedded=false
 
 [User:Keywords]
 DisplayName=Keywords
 Description=User settable keywords which are used to tag a resource
 Parent=DC:Keywords
-DataType=Keyword
+DataType=keyword
 Weight=50
 Embedded=false
 MultipleValues=true

Modified: branches/xesam-support/data/services/document.metadata
==============================================================================
--- branches/xesam-support/data/services/document.metadata	(original)
+++ branches/xesam-support/data/services/document.metadata	Fri Jun  6 13:26:20 2008
@@ -1,7 +1,7 @@
 [Doc:Title]
 DisplayName=Title
 Description=The title of the document
-DataType=Indexable
+DataType=index
 Parent=DC:Title
 Weight=25
 Filtered=false
@@ -9,7 +9,7 @@
 [Doc:Subject]
 DisplayName=Subject
 Description=The subject or topic of the document
-DataType=Indexable
+DataType=index
 Parent=DC:Subject
 Weight=20
 Filtered=false
@@ -17,7 +17,7 @@
 [Doc:Author]
 DisplayName=Author
 Description=The author of the document
-DataType=Indexable
+DataType=index
 Parent=DC:Creator
 Weight=20
 Filtered=false
@@ -25,7 +25,7 @@
 [Doc:Keywords]
 DisplayName=Keywords
 Description=keywords embedded in the document
-DataType=Keyword
+DataType=keyword
 Parent=DC:Keywords
 Weight=25
 Filtered=false
@@ -34,30 +34,30 @@
 [Doc:Comments]
 DisplayName=Comments
 Description=The comments embedded in the document
-DataType=Indexable
+DataType=index
 Parent=DC:Description
 Weight=10
 
 [Doc:PageCount]
 DisplayName=Page count
 Description=Number of pages in the document
-DataType=Integer
+DataType=integer
 
 [Doc:WordCount]
 DisplayName=Word count
 Description=Number of words in the document
-DataType=Integer
+DataType=integer
 
 [Doc:Created]
 DisplayName=Created
 Description=Date document was created
-DataType=DateTime
+DataType=date
 Parent=DC:Date
 
 [Doc:URL]
 DisplayName=URL
 Description=URL to this Doc
-DataType=Indexable
+DataType=index
 Weight=20
 Filtered=false
 

Modified: branches/xesam-support/data/services/file.metadata
==============================================================================
--- branches/xesam-support/data/services/file.metadata	(original)
+++ branches/xesam-support/data/services/file.metadata	Fri Jun  6 13:26:20 2008
@@ -1,7 +1,7 @@
 [File:Name]
 DisplayName=Filename
 Description=Name of File
-DataType=Indexable
+DataType=index
 FieldName=Name
 Parent=DC:Identifier
 Weight=10
@@ -10,14 +10,14 @@
 [File:Ext]
 DisplayName=Extension
 Description=File extension
-DataType=Indexable
+DataType=index
 Weight=15
 Filtered=false
 
 [File:Path]
 DisplayName=Path
 Description=File Path
-DataType=Indexable
+DataType=index
 FieldName=Path
 Parent=DC:Identifier
 Weight=1
@@ -26,7 +26,7 @@
 [File:NameDelimited]
 DisplayName=Keywords
 Description=Name of File
-DataType=Indexable
+DataType=index
 Weight=5
 Filtered=false
 Delimited=true
@@ -34,20 +34,20 @@
 [File:Contents]
 DisplayName=Contents
 Description=File Contents
-DataType=CLOB
+DataType=fulltext
 Weight=1
 
 [File:Link]
 DisplayName=Link
 Description=File Link
-DataType=Indexable
+DataType=index
 Parent=DC:Relation
 Weight=1
 
 [File:Mime]
 DisplayName=Mime Type
 Description=File Mime Type
-DataType=Keyword
+DataType=keyword
 FieldName=Mime
 Parent=DC:Format
 Weight=10
@@ -55,41 +55,41 @@
 [File:Size]
 DisplayName=Size
 Description=File size in bytes
-DataType=Integer
+DataType=integer
 FieldName=Size
 
 [File:License]
 DisplayName=License
 Description=File License Type
-DataType=Indexable
+DataType=index
 Parent=DC:Rights
 Weight=1
 
 [File:Copyright]
 DisplayName=Copyright
 Description=Copyright owners of the file
-DataType=Indexable
+DataType=index
 Parent=DC:Rights
 Weight=1
 
 [File:Modified]
 DisplayName=Modified
 Description=Last modified date
-DataType=DateTime
+DataType=date
 Parent=DC:Date
 FieldName=IndexTime
 
 [File:Accessed]
 DisplayName=Accessed
 Description=Last acessed date
-DataType=DateTime
+DataType=date
 Parent=DC:Date
 FieldName=Accessed
 
 [File:Other]
 DisplayName=Other
 Description=Other details about a file
-DataType=Indexable
+DataType=index
 Weight=1
 
 

Modified: branches/xesam-support/data/services/video.metadata
==============================================================================
--- branches/xesam-support/data/services/video.metadata	(original)
+++ branches/xesam-support/data/services/video.metadata	Fri Jun  6 13:26:20 2008
@@ -1,7 +1,7 @@
 [Video:Title]
 DisplayName=Title
 Description=Video title
-DataType=Indexable
+DataType=index
 Parent=DC:Title
 Weight=20
 Filtered=false
@@ -9,43 +9,43 @@
 [Video:Author]
 DisplayName=Author
 Description=Video author
-DataType=Indexable
+DataType=index
 Parent=DC:Creator
 Weight=15
 
 [Video:Height]
 DisplayName=Height
 Description=The height in pixels
-DataType=Integer
+DataType=integer
 
 [Video:Width]
 DisplayName=Width
 Description=The width in pixels
-DataType=Integer
+DataType=integer
 
 [Video:Duration]
 DisplayName=Duration
 Description=Duration in number of seconds
-DataType=Integer
+DataType=integer
 
 [Video:Comments]
 DisplayName=Comments
 Description=General purpose comments
-DataType=Indexable
+DataType=index
 Weight=1
 Parent=DC:Description
 
 [Video:FrameRate]
 DisplayName=Frame rate
 Description=Number of frames per seconds
-DataType=Double
+DataType=double
 
 [Video:Codec]
 DisplayName=Codec
 Description=Codec used for the video
-DataType=String
+DataType=string
 
 [Video:Bitrate]
 DisplayName=Bitrate
 Description=Bitrate in bits/sec
-DataType=Double
+DataType=double

Modified: branches/xesam-support/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-manager.c	Fri Jun  6 13:26:20 2008
@@ -244,7 +244,7 @@
 			} else if (strcasecmp (keys[j], "DataType") == 0) {
 				GEnumValue *enum_value;
 
-				enum_value = g_enum_get_value_by_name (g_type_class_peek (TRACKER_TYPE_FIELD_TYPE), new_value);
+				enum_value = g_enum_get_value_by_nick (g_type_class_peek (TRACKER_TYPE_FIELD_TYPE), new_value);
 
 				if (enum_value) {
 					tracker_db_interface_execute_query (iface, NULL,
@@ -535,6 +535,7 @@
 
 	tracker_field_set_id (field_def, tracker_int_to_string (id));
 	tracker_field_set_name (field_def, name);
+	tracker_field_set_data_type (field_def, field_type);
 	tracker_field_set_field_name (field_def, field_name);
 	tracker_field_set_weight (field_def, weight);
 	tracker_field_set_embedded (field_def, embedded);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]