Remove unused non-standard tags and nodes support (#595)

* Remove unused tags and node info support

* Don't render Additional Links Panel if there are none to render

Author: tfoote

_includes/package_body.html

@@ -50,18 +50,7 @@ <h4>Third-Party Package</h4>
           <div class="panel-body">
             <table class="table table-condensed">
               <tr>
-                <td style="width:100px;" class="text-right"><strong>Tags</strong></td>
-                <td>
-                  {% assign n_tags = package.data.tags.size %}
-                  {% if n_tags > 0 %}
-                    {% for tag in package.data.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
-                  {% else %}
-                    <em>No category tags.</em>
-                  {% endif %}
-                </td>
-              </tr>
-              <tr>
-                <td class="text-right"><strong>Version</strong></td>
+                <td style="width:100px;" class="text-right"><strong>Version</strong></td>
                 <td>{{ package.data.version }}</td>
               </tr>
               <tr>
@@ -105,19 +94,17 @@ <h4>Third-Party Package</h4>
           <div class="panel-body">
             {{ package.data.description}}
           </div>
+          {% assign n_urls = package.data.urls | size %}
+          {% if n_urls > 0 %}
           <div class="panel-heading"><h4 class="panel-title">Additional Links</h4></div>
           <div class="panel-body">
-            {% assign n_urls = package.data.urls | size %}
-            {% if n_urls > 0 %}
-              <ul class="list-unstyled">
-                {% for url in package.data.urls %}
-                  <li><a href="{{url.uri}}">{%if url.type%}{{url.type | capitalize}}{%else%}{{url.domain}}{%endif%}</a></li>
-                {% endfor %}
-              </ul>
-            {% else %}
-              <em>No additional links.</em>
-            {% endif %}
+            <ul class="list-unstyled">
+              {% for url in package.data.urls %}
+                <li><a href="{{url.uri}}">{%if url.type%}{{url.type | capitalize}}{%else%}{{url.domain}}{%endif%}</a></li>
+              {% endfor %}
+            </ul>
           </div>
+          {% endif %}
           <div class="panel-heading"><h4 class="panel-title">Maintainers</h4></div>
           <div class="panel-body">
             {% assign n_maintainers = package.data.maintainers | size %}

_includes/repo_summary.html

@@ -52,17 +52,6 @@
         {% endif %}</span>
       </td>
     </tr>
-    <tr>
-      <td class="text-right"><b>Tags</b></td>
-      <td>
-        {% assign n_tags = repo.tags.size %}
-        {% if n_tags > 0 %}
-          {% for tag in repo.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
-        {% else %}
-          <em>No category tags.</em>
-        {% endif %}
-      </td>
-    </tr>
     <tr>
       <td class="text-right"><b>Contributing</b></td>
       <td>

_plugins/rosindex_generator.rb

@@ -338,22 +338,6 @@ def extract_package(site, distro, repo, snapshot, checkout_path, path, pkg_type,
       # extract other standard exports
       deprecated = REXML::XPath.first(manifest_doc, "/package/export/deprecated/text()").to_s
 
-      # extract rosindex exports
-      tags = REXML::XPath.each(manifest_doc, "/package/export/rosindex/tags/tag/text()").map { |t| t.to_s }
-      nodes = REXML::XPath.each(manifest_doc, "/package/export/rosindex/nodes").map { |nodes|
-        case nodes.attributes["format"]
-        when "hdf"
-          get_hdf(nodes.text)
-        else
-          REXML::XPath.each(manifest_doc, "/package/export/rosindex/nodes/node").map { |node|
-            {
-              'name' => REXML::XPath.first(node,'/name/text()').to_s,
-              'description' => REXML::XPath.first(node,'/description/text()').to_s,
-              'ros_api' => get_ros_api(REXML::XPath.first(node,'/description/api'))
-            }
-          }
-        end
-      }
 
       # compute the relative path from the root of the repo to this directory
       package_relpath = Pathname.new(File.join(*path)).relative_path_from(Pathname.new(checkout_path))
@@ -454,9 +438,6 @@ def extract_package(site, distro, repo, snapshot, checkout_path, path, pkg_type,
         'dependants' => {},
         # exports
         'deprecated' => deprecated,
-        # rosindex metadata
-        'tags' => tags,
-        'nodes' => nodes,
         # readme
         'readmes' => readmes,
         # changelog
@@ -570,12 +551,8 @@ def scrape_version(site, repo, distro, snapshot, vcs)
       # store this package in the repo snapshot
       snapshot.packages[package_name] = package
 
-      # collect tags from discovered packages
-      repo.tags = Set.new(repo.tags).merge(package_data['tags']).to_a
-
       # add this package to the global package dict
       @package_names[package_name].instances[repo.id] = repo
-      @package_names[package_name].tags = Set.new(@package_names[package_name].tags).merge(package_data['tags']).to_a
 
       # add this package as the default for this distro
       if @repo_names[repo.name].defaults[distro]
@@ -1136,7 +1113,7 @@ def generate(site)
               'baseurl' => site.config['baseurl'],
               'url' => File.join('/p',package_name)+"#"+distro,
               'last_commit_time' => repo_snapshot.data['last_commit_time'],
-              'tags' => (p['tags'] + package_name.split('_')) * " ",
+              'tags' => (package_name.split('_')) * " ",
               'package' => package_name,
               'repo' => repo.name,
               'core' => core,

contribute.md

@@ -37,13 +37,6 @@ easier for users to run your code. In order to release your repository's
 packages, follow the tutorials for the [bloom release automation
 tool](https://docs.ros.org/en/rolling/How-To-Guides/Releasing/Releasing-a-Package.html) on the ROS.org.
 
-## Adding ROS Index Metadata
-
-In addition to standard `README` formats, ROS Index also inspects ROS package
-manifest XML files for ROS Index-specific `<export>` tags in order to read
-additional metadata.
-
-See [ROS Index Metadata]({{ "/contribute/metadata" | prepend: site.baseurl }}) for documentation on these tags.
 
 ## Opting out of Indexing
 

contribute/metadata.md

@@ -42,7 +42,7 @@ The package name is split by underscore (_), and those individual terms are adde
 
 These fields are additionally searched:
 - readme: The 'readme' file included in the package repository.
-- tags: These mostly contains the page name split by '_', so that for example the package with name "avt_vimbra_camera" would have tags 'avt', 'vimbra', and 'camera'. (A few packages have explicit tags defined, but most do not.)
+- tags: These mostly contains the page name split by '_', so that for example the package with name "avt_vimbra_camera" would have tags 'avt', 'vimbra', and 'camera'.
 - released: Is the package released? Has a value 'released' if released, otherwise empty.
 
 ### Example searches