From 57b327971897fda7f430b702c35bfc38db2d310d Mon Sep 17 00:00:00 2001
From: "David I. Lehn" <dlehn@digitalbazaar.com>
Date: Tue, 13 Oct 2015 13:31:32 -0400
Subject: [PATCH] Add inputFormat option to normalize.

- Allows the input to be in N-Quads format (application/nquads) and use N-Quads
  parsing instead of a toRDF step on JSON-LD.
---
 jsonld.php | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/jsonld.php b/jsonld.php
index ec7f956..8b884e3 100644
--- a/jsonld.php
+++ b/jsonld.php
@@ -131,12 +131,15 @@ function jsonld_link($input, $ctx, $options) {
 };
 
 /**
- * Performs RDF dataset normalization on the given JSON-LD input. The output
- * is an RDF dataset unless the 'format' option is used.
+ * Performs RDF dataset normalization on the given input. The input is
+ * JSON-LD unless the 'inputFormat' option is used. The output is an RDF
+ * dataset unless the 'format' option is used.
  *
  * @param mixed $input the JSON-LD object to normalize.
  * @param assoc [$options] the options to use:
  *          [base] the base IRI to use.
+ *          [intputFormat] the format if input is not JSON-LD:
+ *            'application/nquads' for N-Quads.
  *          [format] the format if output is a string:
  *            'application/nquads' for N-Quads.
  *          [documentLoader(url)] the document loader.
@@ -1229,6 +1232,8 @@ class JsonLdProcessor {
    * @param assoc $options the options to use:
    *          [base] the base IRI to use.
    *          [expandContext] a context to expand with.
+   *          [inputFormat] the format if input is not JSON-LD:
+   *            'application/nquads' for N-Quads.
    *          [format] the format if output is a string:
    *            'application/nquads' for N-Quads.
    *          [documentLoader(url)] the document loader.
@@ -1241,18 +1246,26 @@ class JsonLdProcessor {
       'base' => is_string($input) ? $input : '',
       'documentLoader' => $jsonld_default_load_document));
 
-    try {
-      // convert to RDF dataset then do normalization
-      $opts = $options;
-      if(isset($opts['format'])) {
-        unset($opts['format']);
+    if(isset($options['inputFormat'])) {
+      if($options['inputFormat'] != 'application/nquads') {
+         throw new JsonLdException(
+           'Unknown normalization input format.', 'jsonld.NormalizeError');
+      }
+      $dataset = $this->parseNQuads($input);
+    } else {
+      try {
+        // convert to RDF dataset then do normalization
+        $opts = $options;
+        if(isset($opts['format'])) {
+          unset($opts['format']);
+        }
+        $opts['produceGeneralizedRdf'] = false;
+        $dataset = $this->toRDF($input, $opts);
+      } catch(Exception $e) {
+        throw new JsonLdException(
+          'Could not convert input to RDF dataset before normalization.',
+          'jsonld.NormalizeError', null, null, $e);
       }
-      $opts['produceGeneralizedRdf'] = false;
-      $dataset = $this->toRDF($input, $opts);
-    } catch(Exception $e) {
-      throw new JsonLdException(
-        'Could not convert input to RDF dataset before normalization.',
-        'jsonld.NormalizeError', null, null, $e);
     }
 
     // do normalization