Change license header, remove stale pkg files.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / DiscoverableMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
index e3f8925..ce5950b 100644 (file)
--- a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2010 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -46,6 +50,7 @@ DiscoverableMetadataProvider::~DiscoverableMetadataProvider()
 
 void DiscoverableMetadataProvider::generateFeed()
 {
+    m_feed.erase();
     bool first = true;
     const XMLObject* object = getMetadata();
     disco(m_feed, dynamic_cast<const EntitiesDescriptor*>(object), first);
@@ -163,6 +168,23 @@ void DiscoverableMetadataProvider::disco(string& s, const EntityDescriptor* enti
                                 s += "\n ]";
                             }
 
+                            const vector<Keywords*>& keywords = info->getKeywordss();
+                            if (!keywords.empty()) {
+                                s += ",\n \"Keywords\": [";
+                                for (vector<Keywords*>::const_iterator words = keywords.begin(); words != keywords.end(); ++words) {
+                                    if (words != keywords.begin())
+                                        s += ',';
+                                    auto_arrayptr<char> val(toUTF8((*words)->getValues()));
+                                    auto_ptr_char lang((*words)->getLang());
+                                    s += "\n  {\n  \"value\": \"";
+                                    json_safe(s, val.get());
+                                    s += "\",\n  \"lang\": \"";
+                                    s += lang.get();
+                                    s += "\"\n  }";
+                                }
+                                s += "\n ]";
+                            }
+
                             const vector<InformationURL*>& infurls = info->getInformationURLs();
                             if (!infurls.empty()) {
                                 s += ",\n \"InformationURLs\": [";
@@ -211,10 +233,10 @@ void DiscoverableMetadataProvider::disco(string& s, const EntityDescriptor* enti
                                     ht << (*logo)->getHeight().second;
                                     s += "\",\n  \"height\": \"";
                                     s += ht.str();
-                                    ht.clear();
-                                    ht << (*logo)->getWidth().second;
+                                    ostringstream wt;
+                                    wt << (*logo)->getWidth().second;
                                     s += "\",\n  \"width\": \"";
-                                    s += ht.str();
+                                    s += wt.str();
                                     s += '\"';
                                     if ((*logo)->getLang()) {
                                         auto_ptr_char lang((*logo)->getLang());