[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/strigi/src/streamanalyzer
From: Evgeny Egorochkin <phreedom.stdin () gmail ! com>
Date: 2009-12-04 5:04:45
Message-ID: 1259903085.152761.15077.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1058180 by evgeny:
Fixed NMM ontology namespace
CC_MAIL: trueg@kde.org
M +17 -21 endanalyzers/flacendanalyzer.cpp
M +2 -3 endanalyzers/mpegendanalyzer.cpp
M +1 -1 rdfnamespaces.h
M +9 -12 throughanalyzers/oggthroughanalyzer.cpp
M +2 -5 throughplugins/authroughanalyzer.cpp
--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp \
#1058179:1058180 @@ -32,8 +32,6 @@
using namespace Strigi;
using namespace std;
-#define NMM_PROPOSAL "http://www.semanticdesktop.org/ontologies/nmm#"
-
const string
typePropertyName(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
@@ -42,22 +40,22 @@
titlePropertyName(
"http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title"),
albumTrackCountPropertyName(
- NMM_PROPOSAL "albumTrackCount"),
+ NMM_DRAFT "albumTrackCount"),
albumGainPropertyName(
- NMM_PROPOSAL "albumGain"),
+ NMM_DRAFT "albumGain"),
albumPeakGainPropertyName(
- NMM_PROPOSAL "albumPeakGain"),
+ NMM_DRAFT "albumPeakGain"),
albumArtistPropertyName(
- NMM_PROPOSAL "albumArtist"),
+ NMM_DRAFT "albumArtist"),
musicBrainzAlbumIDPropertyName(
- NMM_PROPOSAL "musicBrainzAlbumID"),
+ NMM_DRAFT "musicBrainzAlbumID"),
discNumberPropertyName(
- NMM_PROPOSAL "setNumber"),
+ NMM_DRAFT "setNumber"),
musicClassName(
- NMM_PROPOSAL "MusicPiece"),
+ NMM_DRAFT "MusicPiece"),
albumClassName(
- NMM_PROPOSAL "MusicAlbum"),
+ NMM_DRAFT "MusicAlbum"),
contactClassName(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nco#Contact");
/*
@@ -83,33 +81,31 @@
bitRateField = r.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#averageBitrate");
fields["title"] = r.registerField(titlePropertyName);
- albumField = r.registerField(NMM_PROPOSAL "musicAlbum");
+ albumField = r.registerField(NMM_DRAFT "musicAlbum");
artistField = r.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nco#creator");
- fields["genre"] = r.registerField(NMM_PROPOSAL "genre");
+ fields["genre"] = r.registerField(NMM_DRAFT "genre");
codecField = r.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#codec");
- composerField = r.registerField(NMM_PROPOSAL "composer");
- performerField = r.registerField(NMM_PROPOSAL "performer");
+ composerField = r.registerField(NMM_DRAFT "composer");
+ performerField = r.registerField(NMM_DRAFT "performer");
publisherField = r.registerField(NCO "publisher");
fields["date"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#contentCreated");
descriptionField = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description");
fields["description"] = descriptionField;
fields["comment"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#comment"); \
- fields["tracknumber"] = r.registerField(NMM_PROPOSAL "trackNumber");
- fields["mbtrackid"] = r.registerField(NMM_PROPOSAL "musicBrainzTrackID");
+ fields["tracknumber"] = r.registerField(NMM_DRAFT "trackNumber");
+ fields["mbtrackid"] = r.registerField(NMM_DRAFT "musicBrainzTrackID");
- fields["replaygain_track_gain"] = r.registerField(NMM_PROPOSAL "trackGain");
- fields["replaygain_track_peak"] = r.registerField(NMM_PROPOSAL "trackPeakGain");
+ fields["replaygain_track_gain"] = r.registerField(NMM_DRAFT "trackGain");
+ fields["replaygain_track_peak"] = r.registerField(NMM_DRAFT "trackPeakGain");
fields["version"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#version");
- fields["isrc"] = r.registerField(NMM_PROPOSAL \
"internationalStandardRecordingCode"); + fields["isrc"] = \
r.registerField(NMM_DRAFT "internationalStandardRecordingCode");
fields["copyright"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#copyright");
fields["license"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#license"); \
typeField = r.typeField;
}
-#undef NMM_PROPOSAL
-
bool
FlacEndAnalyzer::checkHeader(const char* header, int32_t headersize) const {
return (headersize>=8) && (readLittleEndianUInt32(header) == 0x43614c66) // Check \
for flac stream marker
--- trunk/kdesupport/strigi/src/streamanalyzer/endanalyzers/mpegendanalyzer.cpp \
#1058179:1058180 @@ -25,16 +25,15 @@
#include "mpegendanalyzer.h"
#include <strigi/strigiconfig.h>
#include "analysisresult.h"
+#include "rdfnamespaces.h"
#include "textutils.h"
#include <iostream>
using namespace Strigi;
using namespace std;
-#define NMM_PROPOSAL "http://www.semanticdesktop.org/ontologies/nmm#"
const string
videoClassName(
- NMM_PROPOSAL "Video");
-#undef NMM_PROPOSAL
+ NMM_DRAFT "Video");
void MpegEndAnalyzerFactory::registerFields(FieldRegister& r) {
fields["length"] = r.registerField(
--- trunk/kdesupport/strigi/src/streamanalyzer/rdfnamespaces.h #1058179:1058180
@@ -39,7 +39,7 @@
#define NID3 "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#"// obsolete
//Draft
-#define NMM_DRAFT "http://www.semanticdesktop.org/ontologies/nmm#"
+#define NMM_DRAFT "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#"
#endif
--- trunk/kdesupport/strigi/src/streamanalyzer/throughanalyzers/oggthroughanalyzer.cpp \
#1058179:1058180 @@ -23,14 +23,13 @@
#include <strigi/strigiconfig.h>
#include "analysisresult.h"
#include "textutils.h"
+#include "rdfnamespaces.h"
#include <iostream>
#include <cctype>
#include <cstring>
using namespace Strigi;
using namespace std;
-#define NMM_PROPOSAL "http://www.semanticdesktop.org/ontologies/nmm#"
-
const string
typePropertyName(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
@@ -40,28 +39,28 @@
"http://www.semanticdesktop.org/ontologies/2007/01/19/nie#title"),
musicClassName(
- NMM_PROPOSAL "MusicPiece"),
+ NMM_DRAFT "MusicPiece"),
albumClassName(
- NMM_PROPOSAL "MusicAlbum"),
+ NMM_DRAFT "MusicAlbum"),
contactClassName(
"http://www.semanticdesktop.org/ontologies/2007/03/22/nco#Contact");
void
OggThroughAnalyzerFactory::registerFields(FieldRegister& r) {
fields["title"] = r.registerField(titlePropertyName);
- albumField = r.registerField(NMM_PROPOSAL "musicAlbum");
+ albumField = r.registerField(NMM_DRAFT "musicAlbum");
artistField = r.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nco#creator");
- fields["genre"] = r.registerField(NMM_PROPOSAL "genre");
+ fields["genre"] = r.registerField(NMM_DRAFT "genre");
fields["codec"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#codec");
- composerField = r.registerField(NMM_PROPOSAL "composer");
- performerField = r.registerField(NMM_PROPOSAL "performer");
+ composerField = r.registerField(NMM_DRAFT "composer");
+ performerField = r.registerField(NMM_DRAFT "performer");
fields["date"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#contentCreated");
fields["description"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#description");
- fields["tracknumber"] = r.registerField(NMM_PROPOSAL "trackNumber");
+ fields["tracknumber"] = r.registerField(NMM_DRAFT "trackNumber");
fields["version"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#version");
- fields["isrc"] = r.registerField(NMM_PROPOSAL \
"internationalStandardRecordingCode"); + fields["isrc"] = \
r.registerField(NMM_DRAFT "internationalStandardRecordingCode");
fields["copyright"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#copyright");
fields["license"] = \
r.registerField("http://www.semanticdesktop.org/ontologies/2007/01/19/nie#license"); \
@@ -70,8 +69,6 @@
fields["type"] = r.typeField;
}
-#undef NMM_PROPOSAL
-
void
OggThroughAnalyzer::setIndexable(AnalysisResult* i) {
indexable = i;
--- trunk/kdesupport/strigi/src/streamanalyzer/throughplugins/authroughanalyzer.cpp \
#1058179:1058180 @@ -23,18 +23,15 @@
#include "analysisresult.h"
#include "fieldtypes.h"
#include "textutils.h"
+#include "rdfnamespaces.h"
using namespace std;
using namespace Strigi;
-#define NMM_PROPOSAL "http://www.semanticdesktop.org/ontologies/nmm#"
-
const string
musicClassName(
- NMM_PROPOSAL "MusicPiece");
+ NMM_DRAFT "MusicPiece");
-#undef NMM_PROPOSAL
-
void
AuThroughAnalyzerFactory::registerFields(FieldRegister& reg) {
lengthField = reg.registerField(
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic