[solang] Replaced OPTIONALs with property functions

[Debarshi Ray <debarshir src gnome org>]

commit c99e1f5503c1cbe17786ebcb727387d22c3f8303
Author: Debarshi Ray <rishi gnu org>
Date:   Fri Feb 5 03:08:41 2010 +0200

    Replaced OPTIONALs with property functions

 src/common/photo.cpp |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/common/photo.cpp b/src/common/photo.cpp
index 04c69df..80e1355 100644
--- a/src/common/photo.cpp
+++ b/src/common/photo.cpp
@@ -102,19 +102,17 @@ Glib::ustring
 Photo::get_exif_data_query() const throw()
 {
     return Glib::ustring::compose(
-        "SELECT ?camera ?exposure ?flash ?fn ?focal ?iso ?metering"
-        "       ?white "
+        "SELECT nmm:camera(?photo)"
+        "       nmm:exposureTime(?photo)"
+        "       nmm:flash(?photo)"
+        "       nmm:fnumber(?photo)"
+        "       nmm:focalLength(?photo)"
+        "       nmm:isoSpeed(?photo)"
+        "       nmm:meteringMode(?photo)"
+        "       nmm:whiteBalance(?photo) "
         "WHERE {"
         "  ?photo a nmm:Photo ;"
         "  nie:url '%1' ."
-        "  OPTIONAL { ?photo nmm:camera ?camera . }"
-        "  OPTIONAL { ?photo nmm:exposureTime ?exposure . }"
-        "  OPTIONAL { ?photo nmm:flash ?flash . }"
-        "  OPTIONAL { ?photo nmm:fnumber ?fn . }"
-        "  OPTIONAL { ?photo nmm:focalLength ?focal . }"
-        "  OPTIONAL { ?photo nmm:isoSpeed ?iso . }"
-        "  OPTIONAL { ?photo nmm:meteringMode ?metering . }"
-        "  OPTIONAL { ?photo nmm:whiteBalance ?white . }"
         "}",
         uri_);
 }