Join using instead on db issues

README.md

@@ -6,7 +6,7 @@ Qiita
 [![Build Status](https://travis-ci.org/biocore/qiita.png?branch=master)](https://travis-ci.org/biocore/qiita)
 [![Coverage Status](https://coveralls.io/repos/biocore/qiita/badge.png?branch=master)](https://coveralls.io/r/biocore/qiita)
 
-Qiita (canonically pronounced *cheetah*) is a meta-analysis environment for microbiome (and other "comparative -omics") datasets. You can find the public Qiita server at [qiita.microbio.me](http://qiita.microbio.me).
+Qiita (canonically pronounced *cheetah*) is an analysis environment for microbiome (and other "comparative -omics") datasets. You can find the public Qiita server at [qiita.microbio.me](http://qiita.microbio.me).
 
 Qiita is currently in pre-alpha status. We are very open to community contributions and feedback. If you're interested in contributing to Qiita, see [CONTRIBUTING.md](https://github.com/biocore/qiita/blob/master/CONTRIBUTING.md). If you'd like to report bugs or request features, you can do that in the [Qiita issue tracker](https://github.com/biocore/qiita/issues).
 

qiita_db/data.py

@@ -1338,7 +1338,7 @@ def delete(cls, processed_data_id):
         QiitaDBStatusError
             If the processed data status is not sandbox
         QiitaDBError
-            If the processed data has (meta)analyses
+            If the processed data has analyses
         """
         if cls(processed_data_id).status != 'sandbox':
             raise QiitaDBStatusError(
@@ -1354,8 +1354,8 @@ def delete(cls, processed_data_id):
         if analyses:
             raise QiitaDBError(
                 "Processed data %d cannot be removed because it is linked to "
-                "the following (meta)analysis: %s" % (processed_data_id,
-                                                      ', '.join(analyses)))
+                "the following analysis: %s" % (processed_data_id,
+                                                ', '.join(analyses)))
 
         # delete
         queue = "delete_processed_data_%d" % processed_data_id

qiita_pet/static/vendor/js/moi.js

@@ -66,15 +66,15 @@ var moi = new function () {
      * websocket. On construction, this method will send a message over the
      * socket to get all known job information associated with this client.
      *
-     * @param {host} The URL for the websocket, minus the ws:// header, or null
-     * to use the default moi-ws.
      * @param {group_id} A group ID to get initial data from, or null to fetch
      * all records associated with the user.
+     * @param {host} The URL for the websocket, minus the ws:// header, or null
+     * to use the default moi-ws.
      * @param {on_open} Optional function for action when websocket is opened.
      * @param {on_close} Optional function for action when websocket is closed.
      * @param {on_error} Optional function for action when websocket errors.
      */
-    this.init = function(host, group_id, on_open, on_close, on_error) {
+    this.init = function(group_id, host, on_open, on_close, on_error) {
         host = host || window.location.host + '/moi-ws/';
         if (!("WebSocket" in window)) {
             alert("Your browser does not appear to support websockets!");

qiita_pet/templates/analysis_selected.html

@@ -58,7 +58,7 @@
     check_color();
 }
 $(document).ready(function() {
-      moi.init(window.location.host + '/analysis/selected/socket/', null, function(){}, error, error);
+      moi.init(null, window.location.host + '/analysis/selected/socket/', function(){}, error, error);
       moi.add_callback('remove_pd', remove_pd_from_html);
       moi.add_callback('remove_sample', remove_sample_from_html);
       moi.add_callback('clear', clear_from_html);
@@ -149,7 +149,7 @@ <h4 class="modal-title" id="myModalLabel">Processed Data {{pid}}</h4>
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h4 class="modal-title" id="myModalLabel">Create new meta-analysis</h4>
+            <h4 class="modal-title" id="myModalLabel">Create new analysis</h4>
           </div>
           <form role="form" action="/analysis/3" method="post">
           <input type="hidden" name="action" value="create">

qiita_pet/templates/list_studies.html

@@ -55,7 +55,7 @@
 }
 
 $(document).ready(function() {
-        moi.init(window.location.host + '/study/list/socket/', null, function(){}, error, error);
+        moi.init(null, window.location.host + '/study/list/socket/', function(){}, error, error);
         moi.add_callback('sel', show_alert);
         function format ( d, row ) {
             // `d` is the original data object for the row

qiita_pet/templates/sitebase.html

@@ -117,12 +117,12 @@
                 <img style="max-width:100px; margin-top: -7px;" src="/static/img/logo-clear.png">
               </a>
             </li>
-            <!-- meta-analysis menu -->
+            <!-- analysis menu -->
             {% if user %}
             <li class="dropdown">
-              <a href="#" data-toggle="dropdown" class="dropdown-toggle">Meta Analysis<b class="caret"></b></a>
+              <a href="#" data-toggle="dropdown" class="dropdown-toggle">Analysis<b class="caret"></b></a>
               <ul class="dropdown-menu">
-                <li><a href="/analysis/selected/">View Selected Samples</a></li>
+                <li><a href="/analysis/selected/">Create From Selected Samples</a></li>
                 <li><a href="/analysis/show/">See Previous Analyses</a></li>
               </ul>
             </li>

qiita_ware/dispatchable.py

@@ -66,7 +66,7 @@ def submit_to_VAMPS(preprocessed_data_id):
 
 def run_analysis(analysis_id, commands, comm_opts=None,
                  rarefaction_depth=None, **kwargs):
-    """Run a meta-analysis"""
+    """Run an analysis"""
     analysis = Analysis(analysis_id)
     ar = RunAnalysis(**kwargs)
     return ar(analysis, commands, comm_opts, rarefaction_depth)