From 0ef57cde9b7c709fd9d854b5a589f0f2fc069719 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 24 Nov 2015 19:18:27 -0500 Subject: [PATCH] dropped an extra logging line, renamed splitter input files, new fortune. --- infobase/fortunes.dat | 18 +++++++++++++++++- nucleus/applications/utilities/splitter.cpp | 2 +- ...r_test_1.txt => test_data-splitter-001.txt} | 0 ...r_test_2.txt => test_data-splitter-002.txt} | 0 4 files changed, 18 insertions(+), 2 deletions(-) rename nucleus/applications/utilities/{splitter_test_1.txt => test_data-splitter-001.txt} (100%) rename nucleus/applications/utilities/{splitter_test_2.txt => test_data-splitter-002.txt} (100%) diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat index 921ce42c..a8948219 100644 --- a/infobase/fortunes.dat +++ b/infobase/fortunes.dat @@ -41265,4 +41265,20 @@ seeking genuine peace and liberation. -- Santikaro, from "Hooked!: Buddhist Writings on Greed, Desire, and the Urge to Consume", edited by Stephanie Kaza, published by Shambhala Publications and Snow Lion Publications - +~ + The teachings are for living in this world—for having fewer problems and +fewer tensions. Many people speak now about world peace. What does that +mean? How can we have world peace if we don’t have peace in ourselves? We +are each members of society—society meaning all of us together, not as +individuals. Since many individuals make up society, it means that the +individuals must have a kind of evolution. Although we have power and +military might, and sometimes there are provisional changes, in the real sense +it never changes. + Society is made up of individuals each having their point of view, their +feelings, and their sensations. If we want to develop society so that there +is more peace and happiness, each one of us must work with our condition. For +example, our society is like numbers. When we count, we must always begin +with the number “1.” If I think about society, I must start with myself as +“number one.” + -- Chögyal Namkhai Norbu, from "Dzogchen Teachings", published by Shambhala + Publications diff --git a/nucleus/applications/utilities/splitter.cpp b/nucleus/applications/utilities/splitter.cpp index ca5b3a67..a6f90526 100644 --- a/nucleus/applications/utilities/splitter.cpp +++ b/nucleus/applications/utilities/splitter.cpp @@ -114,7 +114,7 @@ int splitter_app::execute() for (int i = skip_index; i < cmds.entries(); i++) { const command_parameter &curr = cmds.get(i); if (curr.type() == command_parameter::VALUE) { -log(astring("adding input file:") + curr.text()); +//log(astring("adding input file:") + curr.text()); input_files += curr.text(); } } diff --git a/nucleus/applications/utilities/splitter_test_1.txt b/nucleus/applications/utilities/test_data-splitter-001.txt similarity index 100% rename from nucleus/applications/utilities/splitter_test_1.txt rename to nucleus/applications/utilities/test_data-splitter-001.txt diff --git a/nucleus/applications/utilities/splitter_test_2.txt b/nucleus/applications/utilities/test_data-splitter-002.txt similarity index 100% rename from nucleus/applications/utilities/splitter_test_2.txt rename to nucleus/applications/utilities/test_data-splitter-002.txt -- 2.34.1