cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/ricci/ricci Ricci.cpp
Date: 14 Aug 2006 23:53:22 -0000	[thread overview]
Message-ID: <20060814235322.4856.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-14 23:53:21

Modified files:
	ricci/ricci    : Ricci.cpp 

Log message:
	ricci: display clustername in place of clusteralias if alias not set

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- conga/ricci/ricci/Ricci.cpp	2006/08/10 22:53:09	1.15
+++ conga/ricci/ricci/Ricci.cpp	2006/08/14 23:53:21	1.16
@@ -494,10 +494,13 @@
     String cluster_conf(buff, length);
     
     XMLObject xml(parseXML(cluster_conf));
-    delete [] buff;
-    buff = 0;
+    delete [] buff; buff = 0;
     
-    return pair<String, String>(xml.get_attr("name"), xml.get_attr("alias"));
+    String name = xml.get_attr("name");
+    String alias = xml.get_attr("alias");
+    if (utils::strip(alias).empty())
+      alias = name;
+    return pair<String, String>(name, alias);
   } catch ( ... ) {
     delete [] buff;
     return pair<String, String>("", "");



             reply	other threads:[~2006-08-14 23:53 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-14 23:53 kupcevic [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-07-12 18:46 [Cluster-devel] conga/ricci/ricci Ricci.cpp kupcevic
2006-06-19 22:41 kupcevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060814235322.4856.qmail@sourceware.org \
    --to=kupcevic@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).